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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #24776 from prathamesh-sonpatki/aj-release-notes	Kasper Timm Hansen	2016-04-29	2	-1/+22
\|\
\| *	Active Job: Add note about ability to configure adapters on per job basis in ...	Prathamesh Sonpatki	2016-04-29	2	-1/+22
* \|	Merge pull request #24762 from Envek/solid_durations_2	Andrew White	2016-04-29	4	-11/+47
\|\ \
\| * \|	Change 1.week to create 1 week durations instead of 7 days durations.	Andrey Novikov	2016-04-28	4	-11/+47
* \| \|	Merge pull request #24781 from maclover7/rm-env	Guillermo Iguaran	2016-04-28	3	-12/+39
\|\ \ \
\| * \| \|	Remove last uses of `@env[]` and `@env[]=`	Jon Moss	2016-04-28	3	-12/+39
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #24653 from kbrock/kinder_locking_column	Rafael França	2016-04-28	2	-1/+54
\|\ \ \
\| * \| \|	test the number of times the schema is loading	Keenan Brock	2016-04-28	1	-0/+53
\| * \| \|	schema_load triggers 2nd schema_load (via locking)	Keenan Brock	2016-04-28	1	-1/+1
\|/ / /
* \| \|	Merge pull request #24770 from vipulnsward/guieds-type	Rafael França	2016-04-28	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Pass over debugging guide	Vipul A M	2016-04-28	1	-1/+1
* \| \|	Merge pull request #24772 from javiervidal/broken_links_ryandaigle	Kasper Timm Hansen	2016-04-28	2	-14/+14
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix broken links to ryandaigle.com [ci skip]	Javier Vidal	2016-04-28	2	-14/+14
\|/ /
* \|	Merge pull request #24764 from deivid-rodriguez/review_debugging_guide	Vipul A M	2016-04-28	1	-140/+185
\|\ \
\| * \|	Review the `byebug` debugging guide	David Rodríguez	2016-04-28	1	-140/+185
\|/ /
* \|	Merge pull request #24765 from ralinchimev/fix-inconsistencies-in-rails-docum...	Vipul A M	2016-04-28	1	-4/+4
\|\ \
\| * \|	Fix inconsistent usage of capital letter in rails generate command examples	Ralin Chimev	2016-04-28	1	-4/+4
\|/ /
* \|	Merge pull request #24761 from rubys/patch-3	Richard Schneeman	2016-04-27	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Update to the Rails 5 version of the book	Sam Ruby	2016-04-27	1	-1/+1
\|/
*	Merge pull request #24759 from vipulnsward/push-initilizer-to-end	Rafael França	2016-04-27	1	-4/+4
\|\
\| *	Push action_view.collection_caching to be called towards the end, since it de...	Vipul A M	2016-04-28	1	-4/+4
\|/
*	Prep Rails 5 beta 4	eileencodes	2016-04-27	22	-49/+71
*	Fix release script to allow pre release gems	eileencodes	2016-04-27	1	-1/+1
*	Respect gospel of Railties Gods: no on_load with after.	Kasper Timm Hansen	2016-04-27	1	-3/+1
*	Revert "Change 1.week to create 1 week durations instead of 7 days durations."	Jeremy Daer	2016-04-27	4	-34/+11
*	Merge pull request #24752 from lsylvester/collection_caching-after-set_configs	Kasper Timm Hansen	2016-04-27	1	-1/+1
\|\
\| *	make the collection_caching initializer run after the Action Controller confi...	Lachlan Sylvester	2016-04-27	1	-1/+1
\|/
*	Merge pull request #24747 from Erol/fix-configuration-guide-typo	Jon Moss	2016-04-26	1	-1/+1
\|\
\| *	Fix typo in Configuration Guide [ci skip]	Erol Fornoles	2016-04-27	1	-1/+1
\|/
*	Add more info to insecure URL generation error	Derek Prior	2016-04-26	4	-4/+12
*	Merge pull request #24723 from lvl0nax/array_split_fix	Jeremy Daer	2016-04-26	2	-10/+14
\|\
\| *	Little perfomance fix for Array#split.	lvl0nax	2016-04-26	2	-10/+14
* \|	Merge pull request #24737 from Erol/fix-guides-typo	Richard Schneeman	2016-04-26	1	-1/+1
\|\ \
\| * \|	Fix typo in Rails Guides [ci skip]	Erol Fornoles	2016-04-26	1	-1/+1
\|/ /
* \|	Clear ActionMailer deliveries on setup and teardown	arktisklada	2016-04-25	2	-1/+42
* \|	Merge pull request #24641 from rafaelfranca/fix-per-form-token-with-full-url	Jeremy Daer	2016-04-25	2	-1/+15
\|\ \
\| * \|	Discart the schema and host information when building the per-form token	Rafael Mendonça França	2016-04-20	2	-1/+15
* \| \|	Do not cache ActiveSupport::TimeZone#utc_offset	Alexey Shein	2016-04-25	3	-3/+18
* \| \|	CI: allow JRuby build to fail, too flaky to be useful	Jeremy Daer	2016-04-25	1	-0/+1
* \| \|	Merge pull request #24730 from vipulnsward/move-savepoints	Rafael França	2016-04-25	2	-4/+4
\|\ \ \
\| * \| \|	Move remaining current_savepoint_name to savepoints module	Vipul A M	2016-04-25	2	-4/+4
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #24731 from vipulnsward/database-type	Sean Griffin	2016-04-25	3	-1/+16
\|\ \ \
\| * \| \|	Dont simply assume a type is a valid database type. This is only always true ...	Vipul A M	2016-04-25	3	-1/+16
\| \|/ /
* \| \|	Merge pull request #24729 from Fryguy/date_and_time_depends_on_mattr_accessor	Andrew White	2016-04-25	1	-0/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add require of mattr_accessor since Compatibility relies on it.	Jason Frey	2016-04-25	1	-0/+2
\|/ /
* \|	Merge pull request #24696 from y-yagi/remove_unnessary_option_setting	Kasper Timm Hansen	2016-04-25	4	-5/+24
\|\ \
\| * \|	register rake options to `OptionParser`	yuuji.yaginuma	2016-04-25	2	-0/+14
\| * \|	remove unnessary option setting from test runner	yuuji.yaginuma	2016-04-25	2	-5/+10
* \| \|	Remove `Array#sum` method before override it	yui-knk	2016-04-24	1	-0/+2
* \| \|	Merge pull request #23103 from rails/refactor-handling-of-action-default	Jeremy Daer	2016-04-24	8	-33/+73
\|\ \ \