rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #24285 from tbraun89/patch-1	Rafael França	2016-03-23	1	-2/+2
\|\
\| *	fixed spelling in the attribute_accessors docu	Torsten Braun	2016-03-23	1	-1/+1
\| *	fixed spellin in the mattr_reader documentation	Torsten Braun	2016-03-23	1	-1/+1
* \|	Merge pull request #24037 from jeremy/implicit-render-raises-on-browser-GET-r...	Jeremy Daer	2016-03-23	1	-53/+34
\|\ \
\| * \|	Refinement of our "are you missing a template or did you omit it on purpose?"...	Jeremy Daer	2016-03-03	1	-53/+34
* \| \|	Merge pull request #24259 from jeremy/cable/disconnected-client-errors	Jeremy Daer	2016-03-23	5	-1/+136
\|\ \ \
\| * \| \|	Gracefully handle disconnected clients	Jeremy Daer	2016-03-20	5	-1/+136
* \| \| \|	Merge pull request #24167 from kamipo/append_sql_mode_instead_of_overwriting_...	Jeremy Daer	2016-03-23	3	-28/+44
\|\ \ \ \
\| * \| \| \|	Append sql_mode instead of overwriting in strict mode	Ryuta Kamizono	2016-03-13	2	-28/+37
* \| \| \| \|	Merge pull request #24284 from olivierlacan/patch-1	Rafael França	2016-03-23	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Remove reference to unmaintained plugin/gem	Olivier Lacan	2016-03-23	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #24196 from koenpunt/plugin-action-cable	Kasper Timm Hansen	2016-03-23	1	-2/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Add ActionCable require statement to plugin	Koen Punt	2016-03-23	1	-2/+4
\|/ / / /
* \| \| \|	[ci skip] Improve comment minitest plugin initialization.	Kasper Timm Hansen	2016-03-22	1	-2/+4
* \| \| \|	Don't get ahead of ourselves.	Kasper Timm Hansen	2016-03-22	1	-3/+3
* \| \| \|	Set Rails as the first minitest initialized plugin.	Kasper Timm Hansen	2016-03-22	1	-1/+3
* \| \| \|	Merge pull request #24278 from keram/rails_code_convention	Rafael França	2016-03-22	2	-2/+2
\|\ \ \ \
\| * \| \| \|	Use \|\| instead of `or` as preferred in rails code convention	Marek L	2016-03-22	2	-2/+2
* \| \| \| \|	Merge pull request #24276 from artfuldodger/patch-2	Kasper Timm Hansen	2016-03-22	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fix WebSocket already open log message typo	Jon Evans	2016-03-22	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #24275 from arekf/master	Kasper Timm Hansen	2016-03-22	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fix typo for redirect_back	Arkadiusz Fal	2016-03-22	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #24271 from vipulnsward/grammar-fix-changelog	Yves Senn	2016-03-22	1	-1/+1
\|\ \ \ \
\| * \| \| \|	- Fixed abrupt start of sentence in changelog	Vipul A M	2016-03-22	1	-1/+1
\|/ / / /
* \| \| \|	guides, sync 5.0 release notes with changelogs	Yves Senn	2016-03-22	4	-7/+43
* \| \| \|	guides, sync railties and AP changelogs with 5.0 release notes.	Yves Senn	2016-03-22	3	-13/+43
* \| \| \|	Merge pull request #24269 from bquorning/require-enumerable	Akira Matsuda	2016-03-22	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Require enumerable module when using #sum	Benjamin Quorning	2016-03-22	1	-0/+1
\|/ / / /
* \| \| \|	Merge pull request #24261 from y-yagi/update_default_adapter	Jon Moss	2016-03-21	2	-5/+9
\|\ \ \ \
\| * \| \| \|	update Active Job default adapter [ci skip]	yuuji.yaginuma	2016-03-22	2	-5/+9
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #24258 from jeremy/cable/faye-and-isolated-tests	Jeremy Daer	2016-03-21	2	-3/+15
\|\ \ \ \
\| * \| \| \|	Cable: add isolated tests and FAYE=1 test runs	Jeremy Daer	2016-03-20	2	-3/+15
* \| \| \| \|	Merge pull request #24253 from y-yagi/change_default_value_of_caching	Kasper Timm Hansen	2016-03-21	2	-2/+3
\|\ \ \ \ \
\| * \| \| \| \|	changed default value of `caching` option to `nil`	yuuji.yaginuma	2016-03-21	2	-2/+3
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #24243 from dewski/dont-upgrade-file-watcher	Arthur Neves	2016-03-21	2	-0/+19
\|\ \ \ \ \
\| * \| \| \| \|	Add tests for file_watcher config on update	Arthur Neves	2016-03-21	1	-0/+14
\| * \| \| \| \|	Don't upgrade config.file_watcher during upgrade path	Garrett Bjerkhoel	2016-03-18	1	-0/+5
* \| \| \| \| \|	Fix generator test to match to use the string	Rafael Mendonça França	2016-03-21	2	-2/+2
* \| \| \| \| \|	Merge pull request #24231 from hallmatt/master	Rafael Mendonça França	2016-03-21	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	switched layout :mailer to a string so that mail layout can be properly found...	Matt Hall	2016-03-17	1	-1/+1
* \| \| \| \| \| \|	Keep all session tests in the same file	Rafael Mendonça França	2016-03-21	2	-46/+28
* \| \| \| \| \| \|	Merge pull request #24229 from maclover7/fix-24222	Rafael Mendonça França	2016-03-21	3	-1/+51
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Fix request.reset_session for API controllers	Jon Moss	2016-03-19	3	-1/+51
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #24244 from bronson/asset-pipeline-doc	Jon Moss	2016-03-18	1	-7/+3
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	remove Rails 4 text from asset pipeline guide	Scott Bronson	2016-03-18	1	-7/+3
\|/ / / / /
* \| \| \| \|	Merge pull request #22518 from RochesterinNYC/better-error-message-for-includ...	Arthur Nogueira Neves	2016-03-18	2	-1/+18
\|\ \ \ \ \
\| * \| \| \| \|	Improve clarity of error message for missing includes and eager_load	James Wen	2016-01-28	2	-1/+18
* \| \| \| \| \|	Merge pull request #24223 from mechanicles/reserved-keys-tests	Eileen M. Uchitelle	2016-03-18	1	-6/+7
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Added more tests for reserved hash keys of ActiveJob::Arguments.	Santosh Wadghule	2016-03-17	1	-6/+7
* \| \| \| \| \| \|	Merge pull request #24226 from mabras/master	Xavier Noria	2016-03-18	1	-0/+0
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|