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

	Commit message (Expand)	Author	Age	Files	Lines
*	[ci skip] Remove false documentation	Akshay Vishnoi	2014-04-11	1	-14/+1
*	Remove warning of unused variable	Rafael Mendonça França	2014-04-10	1	-1/+1
*	Merge branch 'rm-uuid-fixtures'	Rafael Mendonça França	2014-04-10	13	-10/+149
\|\
\| *	No need to call send	Rafael Mendonça França	2014-04-10	1	-1/+1
\| *	Merge branch 'master' into rm-uuid-fixtures	Rafael Mendonça França	2014-04-10	79	-287/+783
\| \|\ \| \|/ \|/\|
* \|	Require action_controller before any other action_controller file	Rafael Mendonça França	2014-04-10	1	-0/+1
* \|	Merge pull request #11656 from emre-basala/xml_mini_test	Rafael Mendonça França	2014-04-10	1	-1/+58
\|\ \
\| * \|	Add tests to ActiveSupport:XmlMini to_tag method	emre-basala	2013-08-07	1	-1/+58
* \| \|	Merge pull request #14677 from JuanitoFatas/update-initialization-code-snippets	Rafael Mendonça França	2014-04-10	1	-53/+102
\|\ \ \
\| * \| \|	[ci skip] Update code snippets to latest master (initialization.md).	Juanito Fatas	2014-04-10	1	-53/+102
* \| \| \|	Merge pull request #14679 from pbharadiya/master	Yves Senn	2014-04-10	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Correct factual error for page not found	Parth Bharadiya	2014-04-10	1	-1/+1
\|/ / / /
* / / /	+EOL	Akira Matsuda	2014-04-10	1	-1/+1
\|/ / /
* \| \|	Merge pull request #11411 from dscataglini/master	Aaron Patterson	2014-04-09	1	-6/+12
\|\ \ \
\| * \| \|	private method doesn't work for singleton methods defined this way	Diego Scataglini	2013-07-12	1	-6/+12
* \| \| \|	Only call uniq on the conditional that actually needs it	Carlos Antonio da Silva	2014-04-09	1	-1/+1
* \| \| \|	Remove extra collect call	Carlos Antonio da Silva	2014-04-09	1	-1/+1
* \| \| \|	Merge pull request #14675 from laurocaetano/make_reflection_caches_works_with...	Aaron Patterson	2014-04-09	2	-7/+7
\|\ \ \ \
\| * \| \| \|	Make sure the reflection test is passing a String to the reflection	Lauro Caetano	2014-04-09	1	-1/+1
\| * \| \| \|	Make the aggregate_reflections cache work with strings as its keys.	Lauro Caetano	2014-04-09	1	-2/+2
\| * \| \| \|	No need to call `to_sym` on reflection name, since the cache now works	Lauro Caetano	2014-04-09	1	-2/+2
\| * \| \| \|	Make the reflections cache work with strings as its keys.	Lauro Caetano	2014-04-09	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #14671 from arthurnn/travis_memcache	Rafael Mendonça França	2014-04-09	1	-0/+1
\|\ \ \ \
\| * \| \| \|	add services: memcache to travis	Arthur Neves	2014-04-09	1	-0/+1
\|/ / / /
* \| \| \|	Merge pull request #14668 from laurocaetano/source_option_with_string_value	Aaron Patterson	2014-04-09	2	-3/+3
\|\ \ \ \
\| * \| \| \|	The `source` option for `has_many => through` should accept String	Lauro Caetano	2014-04-09	2	-3/+3
\|/ / / /
* \| \| \|	Merge pull request #14665 from andrielfn/avoid-uri-parsing	Rafael Mendonça França	2014-04-09	2	-5/+15
\|\ \ \ \
\| * \| \| \|	Avoid URI parsing	Andriel Nuernberg	2014-04-09	2	-5/+15
* \| \| \| \|	Merge pull request #14667 from lucasmazza/require-per-thread-registry	Rafael Mendonça França	2014-04-09	1	-0/+1
\|\ \ \ \ \
\| * \| \| \| \|	Add missing require so requiring `active_support/cache` works again.	Lucas Mazza	2014-04-09	1	-0/+1
\| \|/ / / /
* / / / /	depend_on_asset is not required anymore on sprockets-rails 2.1.2	Rafael Mendonça França	2014-04-09	3	-25/+11
\|/ / / /
* \| \| \|	Merge pull request #14654 from Alamoz/secret_key	Rafael Mendonça França	2014-04-09	1	-4/+7
\|\ \ \ \
\| * \| \| \|	Expand explanation of how to set secrets.yml. [ci skip]	Adrien Lamothe	2014-04-08	1	-4/+7
* \| \| \| \|	upgrading section for 4.1 is no longer WIP. [ci skip]	Yves Senn	2014-04-09	1	-2/+0
* \| \| \| \|	Merge pull request #14653 from vdmgolub/patch-1	Arun Agrawal	2014-04-09	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Guides: minor typo fixed [ci skip]	Vadim Golub	2014-04-09	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #14652 from Emily/duration_eqls	Guillermo Iguaran	2014-04-08	3	-0/+45
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Fixed problem where `1.day.eql?(1.day)` is false	Emily Dobervich	2014-04-08	3	-0/+45
\|/ / / /
* \| \| \|	new CHANGELOGs entries are in the top [ci skip]	Rafael Mendonça França	2014-04-08	1	-4/+4
* \| \| \|	Merge pull request #14647 from matiaskorhonen/updates-maintenance-policy	Rafael Mendonça França	2014-04-08	2	-3/+7
\|\ \ \ \
\| * \| \| \|	Updates the maintenance policy with new Rails versions	Matias Korhonen	2014-04-08	2	-3/+7
\|/ / / /
* \| \| \|	Dont abbreviate that which needs no abbreviation	David Heinemeier Hansson	2014-04-08	1	-2/+2
* \| \| \|	Dont encourage aliases now that we have variants	David Heinemeier Hansson	2014-04-08	1	-1/+0
* \| \| \|	Use short-form for the scaffold render calls and drop the needless test	David Heinemeier Hansson	2014-04-08	2	-9/+2
* \| \| \|	Merge pull request #14633 from matthewd/narrow_database_url	Rafael Mendonça França	2014-04-08	14	-101/+251
\|\ \ \ \
\| * \| \| \|	Drop in @jeremy's new database.yml template text	Matthew Draper	2014-04-09	13	-44/+206
\| * \| \| \|	Don't deprecate after all	Matthew Draper	2014-04-09	2	-27/+11
\| * \| \| \|	Less ambition, more deprecation	Matthew Draper	2014-04-09	2	-75/+27
\| * \| \| \|	Ensure we correctly and immediately load all ENV entries	Matthew Draper	2014-04-08	1	-0/+21
\| * \| \| \|	Give a deprecation message even when the lookup fails	Matthew Draper	2014-04-08	2	-4/+6