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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #20800 from xijo/make_active_job_locale_aware	Kasper Timm Hansen	2015-08-04	11	-2/+111
\|\
\| *	Fixes #20799	Johannes Opper	2015-08-04	11	-2/+111
* \|	Merge pull request #21076 from r11runner/guide-join-tables	Claudio B.	2015-08-03	2	-10/+21
\|\ \
\| * \|	[ci skip] migration and association guides: added some remarks about join tables	r11runner	2015-08-04	2	-10/+21
* \| \|	Merge pull request #21105 from os97673/allow-minitest-plugins	Rafael Mendonça França	2015-08-03	1	-0/+1
\|\ \ \
\| * \| \|	Allow Minitest to load plugins. Fixes #21102	Oleg Sukhodolsky	2015-08-03	1	-0/+1
* \| \| \|	Merge pull request #21109 from vngrs/update_javascript_manifest_doc	Kasper Timm Hansen	2015-08-03	2	-2/+2
\|\ \ \ \
\| * \| \| \|	Inform user to add script in correct location into the application.js manifes...	Mehmet Emin İNAÇ	2015-08-03	2	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #21087 from vngrs/fix_hash_except_doc	Kasper Timm Hansen	2015-08-03	1	-8/+9
\|\ \ \ \
\| * \| \| \|	Fix the documentation of Hash#except method [ci skip]	Mehmet Emin İNAÇ	2015-08-03	1	-8/+9
* \| \| \| \|	Revert "test runner should crash with non existing file argument."	Yves Senn	2015-08-03	2	-6/+1
* \| \| \| \|	Correctly close a fenced code block [ci skip]	Robin Dupret	2015-08-03	1	-0/+1
* \| \| \| \|	Add note to routing guide about overriding defaults [ci skip]	Andrew White	2015-08-03	1	-0/+2
* \| \| \| \|	Merge pull request #21052 from robin850/caching-guide	Kasper Timm Hansen	2015-08-03	2	-51/+160
\|\ \ \ \ \
\| * \| \| \| \|	Improve the "Caching with Rails" guide's introduction [ci skip]	claudiob	2015-08-03	1	-2/+14
\| * \| \| \| \|	Add a section about "Collection caching" [ci skip]	Robin Dupret	2015-08-03	1	-0/+23
\| * \| \| \| \|	Publish the "Caching with Rails" guide [ci skip]	Celestino Gomes	2015-07-28	1	-0/+4
\| * \| \| \| \|	Add a "Managing dependencies" part to the caching guide [ci skip]	Robin Dupret	2015-07-28	1	-0/+87
\| * \| \| \| \|	Tiny edits to the "Caching with Rails" guide	Robin Dupret	2015-07-28	1	-49/+32
* \| \| \| \| \|	Merge pull request #21104 from atul-shimpi/master	Yves Senn	2015-08-03	2	-2/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Inform user to add styles in correct location in application.css	atul-shimpi	2015-08-03	2	-2/+4
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	test runner should crash with non existing file argument.	Yves Senn	2015-08-03	2	-1/+6
* \| \| \| \| \|	Merge pull request #21095 from aditya-kapoor/add-missing-assertion	Yves Senn	2015-08-03	1	-2/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add missing assertion for test_route_with_colon_first	Aditya Kapoor	2015-08-03	1	-2/+4
* \| \| \| \| \| \|	Merge pull request #21103 from mikeastock/update_time_advance_docs	Yves Senn	2015-08-03	1	-0/+6
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	[ci skip] Update Time#advance documentation with examples	Michael Stock	2015-08-02	1	-0/+6
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #21093 from vngrs/fix_ambiguous_argument_warning	Kasper Timm Hansen	2015-08-02	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix ambiguous argument warning	Mehmet Emin İNAÇ	2015-08-02	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #21100 from bquorning/route-set	Richard Schneeman	2015-08-02	1	-2/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Use #start_with? and #[] for speed	Benjamin Quorning	2015-08-02	1	-2/+2
* \| \| \| \| \| \|	Merge pull request #21098 from bquorning/shovel-twice-and-save-a-string	Richard Schneeman	2015-08-02	1	-3/+8
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Save a string allocation inside loop	Benjamin Quorning	2015-08-02	1	-3/+8
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #21097 from y-yagi/fix_button_to_example	Arun Agrawal	2015-08-02	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	correct example of button_tag [ci skip]	yuuji.yaginuma	2015-08-02	1	-1/+1
\|/ / / / /
* \| \| \| \|	Fix test failures caused by #20884	Sean Griffin	2015-08-01	1	-1/+3
* \| \| \| \|	Merge pull request #20884	Sean Griffin	2015-08-01	6	-0/+137
\|\ \ \ \ \
\| * \| \| \| \|	Add #cache_key to ActiveRecord::Relation.	Alberto F. Capel	2015-07-20	6	-0/+137
* \| \| \| \| \|	Merge pull request #21088 from yui-knk/doc/to_param	Richard Schneeman	2015-08-01	2	-0/+29
\|\ \ \ \ \ \
\| * \| \| \| \| \|	[ci skip]	yui-knk	2015-08-01	2	-0/+29
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	docs, custom api base controllers shoudl subclass metal. [ci skip]	Yves Senn	2015-08-01	1	-1/+1
* \| \| \| \| \|	Merge pull request #21008 from svenwin/patch-1	Yves Senn	2015-08-01	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add documentation to get a running custom base controller [ci skip]	Sven Winkler	2015-07-23	1	-1/+1
* \| \| \| \| \| \|	minor AR changelog edits. [ci skip]	Yves Senn	2015-08-01	1	-9/+8
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #21063 from cmisenas/fix-guides-warning-env	Yves Senn	2015-07-31	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix WARNINGS flag inside guides/Rakefile	Jade Misenas	2015-07-29	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #20992 from JuanitoFatas/fix/bin-setup-script	Yves Senn	2015-07-31	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Don't fail when checking dependencies in bin/setup script	Juanito Fatas	2015-07-23	1	-1/+1
* \| \| \| \| \| \| \|	Merge pull request #21075 from byroot/not-empty-vs-any	Rafael Mendonça França	2015-07-30	1	-2/+2
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Array#any? is slower and not the inverse of Array#empty?	Jean Boussier	2015-07-30	1	-2/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #21057 from schneems/schneems/journey-formatter-objects	Richard Schneeman	2015-07-30	18	-68/+157
\|\ \ \ \ \ \ \ \