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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #6051 from rafaelfranca/fix_build	José Valim	2012-04-29	2	-3/+3
\|\
\| *	Remove warning of unused variable	Rafael Mendonça França	2012-04-29	1	-1/+1
\| *	Fix the build.	Rafael Mendonça França	2012-04-29	1	-2/+2
\|/
*	Don't convert params if the request isn't HTML - fixes #5341	Andrew White	2012-04-29	2	-8/+58
*	Lazy load `default_form_builder` if it's passed as a string	Piotr Sarnacki	2012-04-28	4	-2/+27
*	Allow Thor 0.15 and 1.0, to be released shortly	tomhuda	2012-04-28	1	-1/+5
*	Merge pull request #6038 from arunagw/warning_removed_3-2-stable	Piotr Sarnacki	2012-04-28	1	-1/+0
\|\
\| *	Remove circular require of time/zones	Oscar Del Ben	2012-04-29	1	-1/+0
\|/
*	Merge pull request #6022 from sikachu/3-2-stable-record_tag_backport	Aaron Patterson	2012-04-27	2	-2/+8
\|\
\| *	Do not mutate options hash	Carlos Antonio da Silva	2012-04-27	2	-2/+8
\|/
*	Merge pull request #4528 from j-manu/log-tailer-fix	Aaron Patterson	2012-04-27	1	-3/+7
*	fix number_to_human docs [ci skip]	Vijay Dev	2012-04-26	1	-2/+2
*	Merge pull request #5971 from carlosantoniodasilva/fix-build-3-2	Jeremy Kemper	2012-04-24	1	-1/+1
\|\
\| *	Add extra order clause to fix failing test on Ruby 1.8.7	Carlos Antonio da Silva	2012-04-24	1	-1/+1
\|/
*	Merge pull request #5968 from sikachu/3-2-stable-backport	Jeremy Kemper	2012-04-24	2	-3/+9
\|\
\| *	Fix build. It seems that the Mocha's behavior were changed.	kennyj	2012-04-24	2	-3/+9
\|/
*	Merge pull request #5946 from sikachu/3-2-stable-fix-merge-conflict	Santiago Pastorino	2012-04-23	1	-9/+11
\|\
\| *	Fix broken test from the earlier merge conflict	Prem Sichanugrist	2012-04-23	1	-9/+11
\|/
*	Merge pull request #5866 from tiegz/minor_fixes_3-2-stable	Aaron Patterson	2012-04-23	2	-42/+27
\|\
\| *	converting some tests to assert_raises, and DRY'ing retrieve_variable changes	Tieg Zaharia	2012-04-16	2	-47/+23
\| *	catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead	Tieg Zaharia	2012-04-16	2	-1/+10
* \|	Merge pull request #5919 from joevandyk/rake-dsl-fix	Jeremy Kemper	2012-04-23	1	-1/+1
\|\ \
\| * \|	Only include Rake::DSL if it's defined.	Joe Van Dyk	2012-04-21	1	-1/+1
* \| \|	Merge pull request #5936 from arunagw/other_readme_fixes	Vijay Dev	2012-04-23	6	-6/+6
\|\ \ \
\| * \| \|	Updated other README to point 3-2-stable	Arun Agrawal	2012-04-23	6	-6/+6
* \| \| \|	Merge pull request #5935 from arunagw/readme_fixes_3-2-stable	Vijay Dev	2012-04-23	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	ARes URL should be pointed to 3-2-stable tree not master.	Arun Agrawal	2012-04-23	1	-1/+1
\|/ / /
* \| \|	Merge pull request #5896 from sferik/revert_5861	Jeremy Kemper	2012-04-21	2	-4/+18
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Use `Object#respond_to?` to determine which MultiJson API to use	Erik Michaels-Ober	2012-04-18	1	-3/+17
\| * \|	Revert "multi_json is restricted to < 1.3 "	Erik Michaels-Ober	2012-04-18	1	-1/+1
* \| \|	Be sure to correctly fetch PK name from MySQL even if the PK has some custom ...	Akira Matsuda	2012-04-19	2	-1/+31
* \| \|	Merge pull request #5898 from benedikt/3-2-stable	Jeremy Kemper	2012-04-19	6	-8/+40
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Removes unneeded caching from ActiveRecord::Base.relation	Benedikt Deicke	2012-04-19	1	-4/+3
\| * \|	Revert "Revert "Fix #5667. Preloading should ignore scoping.""	Benedikt Deicke	2012-04-19	2	-2/+9
\| * \|	Adds test to check that circular preloading does not modify Model.unscoped (a...	Benedikt Deicke	2012-04-19	3	-4/+26
\| * \|	Removes caching from ActiveRecord::Core::ClassMethods#relation	Benedikt Deicke	2012-04-19	2	-2/+6
\|/ /
* \|	Revert "Fix #5667. Preloading should ignore scoping."	Jeremy Kemper	2012-04-18	3	-20/+2
* \|	Add hook for add_resource_route	Santiago Pastorino	2012-04-18	4	-7/+21
* \|	Merge pull request #5894 from norman/3-2-fix-nil-logger	Aaron Patterson	2012-04-18	1	-1/+1
\|\ \
\| * \|	Check for nil logger	Norman Clarke	2012-04-18	1	-1/+1
\|/ /
* \|	Merge pull request #5874 from asanghi/3-2-stable	Jeremy Kemper	2012-04-17	4	-5/+5
\|\ \ \| \|/ \|/\|
\| *	Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more ma...	Aditya Sanghi	2012-04-17	4	-5/+5
\|/
*	Merge pull request #5861 from arunagw/multi_json_fix_3-2-stable	Jeremy Kemper	2012-04-16	1	-1/+1
\|\
\| *	multi_json is restricted to < 1.3	Arun Agrawal	2012-04-16	1	-1/+1
* \|	Add missing require in Active Support time zones (fixes #5854)	Piotr Sarnacki	2012-04-15	1	-0/+1
\|/
*	"rails new -h" shows message in rails directory	ask	2012-04-13	2	-3/+17
*	fix typo in readme [ci skip]	Vijay Dev	2012-04-12	1	-1/+1
*	Fix code example in generator test case	Prem Sichanugrist	2012-04-12	1	-2/+2
*	Merge pull request #5820 from arunagw/more_ruby-2-0-fixes	Jeremy Kemper	2012-04-12	1	-1/+9
\|\
\| *	test against ruby features in order to fix tests on Ruby 2.0	Aaron Patterson	2012-04-12	1	-1/+9
\|/