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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #13287 from aayushkhandelwal11/typo_rectified	Yves Senn	2013-12-11	3	-5/+5
\|\
\| *	typos rectified lifecycle => life cycle	Aayush khandelwal	2013-12-12	3	-5/+5
* \|	JSON: speed up date/time encoding	Jeremy Kemper	2013-12-11	1	-24/+19
* \|	Merge pull request #13284 from aayushkhandelwal11/typos_corrected	Godfrey Chan	2013-12-11	3	-3/+3
\|\ \
\| * \|	typos rectified [ci skip]	Aayush khandelwal	2013-12-12	3	-3/+3
\| \|/
* \|	Merge pull request #13279 from misfo/session-fetch-that-behaves-like-hash-fetch	Rafael Mendonça França	2013-12-11	3	-14/+11
\|\ \
\| * \|	Update CHANGELOG entry for Session#fetch	Trent Ogren	2013-12-11	1	-3/+1
\| * \|	Make ActionDispatch::Request::Session#fetch behave like Hash#fetch	Trent Ogren	2013-12-11	2	-11/+10
* \| \|	Merge pull request #13281 from waynn/patch-5	Rafael Mendonça França	2013-12-11	1	-1/+1
\|\ \ \
\| * \| \|	test description uses "disable" when it should be "disabled"	Waynn Lue	2013-12-11	1	-1/+1
\|/ / /
* \| \|	Merge pull request #13280 from waynn/patch-4	Rafael Mendonça França	2013-12-11	1	-1/+1
\|\ \ \
\| * \| \|	value is "disabled" not "disable"	Waynn Lue	2013-12-11	1	-1/+1
* \| \| \|	Remove not necessary file, move constants to the file they are used	Carlos Antonio da Silva	2013-12-11	3	-8/+8
* \| \| \|	Merge pull request #13264 from laurocaetano/fix_dynamic_finder_with_reserved_...	Rafael Mendonça França	2013-12-11	3	-2/+16
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Prevent invalid code when using dynamic finders with Ruby's reserved words.	Lauro Caetano	2013-12-11	3	-2/+16
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'support-deprecated-finders'	Rafael Mendonça França	2013-12-11	8	-48/+66
\|\ \ \
\| * \| \|	Move the parameter normalization to the initialize method	Rafael Mendonça França	2013-12-11	1	-4/+5
\| * \| \|	Revert the whole refactoring in the association builder classes.	Rafael Mendonça França	2013-12-11	8	-47/+64
\| \| \|/ \| \|/\|
* / \|	Nodoc missing number helper classes in AS [ci skip]	Carlos Antonio da Silva	2013-12-11	3	-4/+2
\|/ /
* \|	Revert "Merge pull request #13276 from aayushkhandelwal11/change_to_key"	Rafael Mendonça França	2013-12-11	1	-1/+2
* \|	Mark the arguments needed by activerecord-deprecated_finders with a TODO	Rafael Mendonça França	2013-12-11	4	-2/+20
* \|	Revert "Merge pull request #12518 from vipulnsward/remove_count_options"	Rafael Mendonça França	2013-12-11	5	-17/+20
* \|	Bring back the valid_options class accessor	Rafael Mendonça França	2013-12-11	6	-9/+14
* \|	Merge pull request #13276 from aayushkhandelwal11/change_to_key	Rafael Mendonça França	2013-12-11	1	-2/+1
\|\ \
\| * \|	removing multiple check conditions to single check condition	Aayush khandelwal	2013-12-11	1	-2/+1
\| \|/
* \|	Merge pull request #13273 from robertomiranda/test-remove-require	Guillermo Iguaran	2013-12-11	1	-1/+0
\|\ \
\| * \|	Remove require 'models/administrator', Administrator is not used in secure pa...	robertomiranda	2013-12-11	1	-1/+0
* \| \|	Merge pull request #13270 from aayushkhandelwal11/typos	Damien Mathieu	2013-12-11	2	-2/+2
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	typo rectified [skip ci]	Aayush khandelwal	2013-12-11	2	-2/+2
\|/ /
* \|	Merge pull request #13260 from arunagw/using-parallelize_me	Aaron Patterson	2013-12-10	1	-6/+3
\|\ \
\| * \|	Using parallelize_me! to parallelize isolated test	Arun Agrawal	2013-12-10	1	-6/+3
* \| \|	Merge pull request #12699 from drogus/fix-mounting-engine-in-resources	Piotr Sarnacki	2013-12-10	3	-2/+18
\|\ \ \
\| * \| \|	Fix mounting engines inside a resources block	Piotr Sarnacki	2013-12-10	3	-2/+18
\|/ / /
* \| \|	Revert "Rename not Ruby files to .tt"	Santiago Pastorino	2013-12-10	16	-0/+0
* \| \|	Merge pull request #13258 from semaperepelitsa/docs	Damien Mathieu	2013-12-10	1	-1/+1
\|\ \ \
\| * \| \|	Fix typo in docs, missing colon in Symbol literal [ci skip]	Semyon Perepelitsa	2013-12-11	1	-1/+1
\|/ / /
* \| \|	Merge pull request #13257 from eshira/optimize-gsub	José Valim	2013-12-10	1	-1/+2
\|\ \ \
\| * \| \|	Replace with gsub! in ActiveSupport::Inflector.	Elben Shira	2013-12-10	1	-1/+2
\|/ / /
* \| \|	Rename not Ruby files to .tt	Santiago Pastorino	2013-12-10	16	-0/+0
* \| \|	Merge pull request #13253 from strzalek/variants-inline2	David Heinemeier Hansson	2013-12-10	3	-4/+65
\|\ \ \
\| * \| \|	Inline variants syntax	Łukasz Strzałkowski	2013-12-10	3	-3/+63
\| * \| \|	Simplify @responses hash initialization	Łukasz Strzałkowski	2013-12-10	1	-1/+2
* \| \| \|	make `collect_deprecations` available.	Yves Senn	2013-12-10	1	-11/+10
* \| \| \|	Merge pull request #13236 from jetthoughts/13230_type_cast_bug_in_agr_functions	Yves Senn	2013-12-10	3	-1/+23
\|\ \ \ \
\| * \| \| \|	Fix type cast on group sum with custom expression	Paul Nikitochkin	2013-12-10	3	-1/+23
\| \|/ / /
* \| \| \|	doc: date/conversions.rb should talk about date format not time format.	Yves Senn	2013-12-10	1	-2/+2
* \| \| \|	Fix warnings on mysql2 explain test	Carlos Antonio da Silva	2013-12-10	1	-3/+3
* \| \| \|	Merge pull request #13248 from yahonda/support_mysql573_explain	Jeremy Kemper	2013-12-09	1	-3/+3
\|\ \ \ \
\| * \| \| \|	Support MySQL 5.7 explain	Yasuo Honda	2013-12-10	1	-3/+3
\| \|/ / /
* \| \| \|	Merge pull request #13247 from yahonda/support_mysql573_primary_key	Jeremy Kemper	2013-12-09	3	-7/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \|