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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #22380 from wjessop/fix_race_in_aj_integration_tests	Sean Griffin	2015-11-23	3	-7/+18
\|\
\| *	Fix race condition testing for job execution order	Will Jessop	2015-11-23	3	-7/+18
\|/
*	Bring back `===` stubbing in `time_zone_select` test.	Kasper Timm Hansen	2015-11-22	1	-1/+7
*	Ditch `each_with_index` for `each`.	Kasper Timm Hansen	2015-11-22	1	-1/+1
*	Don't cache fake time zones.	Kasper Timm Hansen	2015-11-22	1	-8/+9
*	Merge pull request #21615 from ronakjangir47/actionViewpart2	Kasper Timm Hansen	2015-11-22	5	-79/+133
\|\
\| *	Removed Mocha from Action View	Ronak Jangir	2015-09-23	5	-79/+133
* \|	removes the mutex around `changed`	Xavier Noria	2015-11-22	1	-7/+2
* \|	reset the @updated flag before the callback invocation	Xavier Noria	2015-11-21	1	-2/+1
* \|	make the @updated flag atomic in the evented monitor	Xavier Noria	2015-11-21	1	-5/+11
* \|	Merge pull request #22333 from harrykiselev/patch-3	Yves Senn	2015-11-21	1	-1/+5
\|\ \
\| * \|	Update dirty.rb: documentation fix.	Harry V. Kiselev	2015-11-19	1	-1/+5
* \| \|	Merge pull request #22362 from radar/toggle-documentation	Claudio B	2015-11-20	1	-0/+8
\|\ \ \
\| * \| \|	Add example for AR::Persistence#toggle	Ryan Bigg	2015-11-21	1	-0/+8
* \| \| \|	Merge pull request #22353 from Bounga/doc_for_cookies_encrypted	Claudio B	2015-11-20	1	-0/+7
\|\ \ \ \
\| * \| \| \|	Add missing example for cookies.encrypted [ci skip]	Nicolas Cavigneaux	2015-11-20	1	-0/+7
* \| \| \| \|	Merge pull request #22354 from nishantmodak/image-tag-data-attributes	Rafael França	2015-11-20	2	-1/+4
\|\ \ \ \ \
\| * \| \| \| \|	Example of setting data attributes for image_tag	Nishant Modak	2015-11-20	2	-1/+4
\| \|/ / / /
* \| \| \| \|	Merge pull request #22355 from yui-knk/remove_arity_check	Kasper Timm Hansen	2015-11-20	2	-10/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Remove arity check for `RouteSet#draw`	yui-knk	2015-11-21	2	-10/+0
\|/ / / /
* \| \| \|	Merge pull request #22332 from grosser/grosser/deprecation	Rafael França	2015-11-20	6	-4/+72
\|\ \ \ \
\| * \| \| \|	add deprecations for a smooth transition after #22215	Michael Grosser	2015-11-19	6	-4/+72
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #22347 from kamipo/fix_test_index_in_create	Sean Griffin	2015-11-19	2	-6/+6
\|\ \ \ \
\| * \| \| \|	Fix test failure in `adapters/mysql/active_schema_test.rb`	Ryuta Kamizono	2015-11-20	2	-6/+6
\|/ / / /
* \| \| \|	Revert "Allow specifying the default table options for mysql adapters"	Sean Griffin	2015-11-19	3	-26/+1
* \| \| \|	Allow specifying the default table options for mysql adapters	Sean Griffin	2015-11-19	3	-1/+26
* \| \| \|	Merge pull request #22336 from tjschuck/enumerable_sum_perf	Kasper Timm Hansen	2015-11-19	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Change Enumerable#sum to use inject(:sym) specification	T.J. Schuck	2015-11-19	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #22340 from rbr/change-configuration-example	Yves Senn	2015-11-19	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Change configuration-guide example	rbr	2015-11-19	1	-1/+1
* \| \| \| \|	Merge pull request #22342 from AlexVPopov/patch-1	Abdelkader Boudih	2015-11-19	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fix a typo	Alex Popov	2015-11-19	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #22077 from obduk/clean-up-logs	Kasper Timm Hansen	2015-11-19	1	-3/+3
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Remove newlines from start of logs	Owen Davies	2015-10-26	1	-3/+3
* \| \| \| \|	guides, scaffold no longer used in getting started guide. Closes #22337.	Yves Senn	2015-11-19	1	-6/+24
* \| \| \| \|	Merge pull request #22338 from zacharywelch/patch-1	Rafael França	2015-11-19	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	[ci skip] Indentation in cache examples	zacharywelch	2015-11-18	1	-2/+2
\|/ / / / /
* \| / / /	Add missing require	Matthew Draper	2015-11-19	1	-0/+2
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #22330 from samphilipd/samphilipd/rename_advisory_lock_key	Rafael França	2015-11-18	8	-65/+65
\|\ \ \ \
\| * \| \| \|	Rename 'key' to 'lock_id' or 'lock_name' for advisory locking	Sam Davies	2015-11-18	8	-65/+65
* \| \| \| \|	Revert "Fixed a few grammar issues."	Rafael Mendonça França	2015-11-18	2	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #22328 from k0kubun/upgrade-byebug	Kasper Timm Hansen	2015-11-18	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Use latest byebug	Takashi Kokubun	2015-11-18	1	-1/+1
* \| \| \| \|	Merge pull request #22326 from mvj3/minor-grammar-issues	Rafael França	2015-11-18	2	-2/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fixed a few grammar issues.	David Chen	2015-11-18	2	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #22323 from jessedoyle/patch-1	Claudio B	2015-11-17	1	-1/+1
\|\ \ \ \
\| * \| \| \|	[ci skip] fix inconsistent indentation	Jesse Doyle	2015-11-17	1	-1/+1
\|/ / / /
* \| \| \|	Fix incorrect issue number [ci skip]	Andrew White	2015-11-17	1	-1/+1
* \| \| \|	Merge pull request #22316 from yui-knk/changelog_for_22300	Andrew White	2015-11-17	1	-0/+6
\|\ \ \ \
\| * \| \| \|	[ci skip] Add CHANGELOG for #22300 (817c1825c15013fd0180762ac5c05a2e024a640d)	yui-knk	2015-11-18	1	-0/+6