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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #4445 from nragaz/role_based_params_wrapping	José Valim	2012-05-04	2	-4/+18
\|\
\| *	Add a role option to wrap_parameters.	Nick Ragaz	2012-05-04	2	-4/+18
* \|	Merge pull request #6158 from Dagnan/3-2-stable	Vijay Dev	2012-05-04	1	-8/+10
\|\ \ \| \|/ \|/\|
\| *	improvements in "caching_with_rails" guide - backported from docrails	kucaahbe	2012-05-04	1	-8/+10
\|/
*	Reset the request parameters after a constraints check	Andrew White	2012-05-03	3	-0/+25
*	Merge pull request #6095 from route/assets_precompile_task	Jeremy Kemper	2012-05-02	2	-0/+12
\|\
\| *	Added test for assets:precompile for index files	Dmitry Vorotilin	2012-05-01	1	-0/+9
\| *	Fix #3993 assets:precompile task does not detect index files	Dmitry Vorotilin	2012-05-01	1	-0/+3
* \|	Deprecate remove_column with array as an argument	Piotr Sarnacki	2012-05-02	3	-0/+19
\|/
*	Correcting some confusion. Pago Pago is part of American Samoa, not Samoa.	Dave Gerton	2012-04-30	1	-2/+4
*	Failing test for #6034	Piotr Sarnacki	2012-04-30	1	-0/+20
*	fix the Flash middleware loading the session on every request (very dangerous...	Will Bryant	2012-04-30	2	-7/+3
*	Add note about using 303 See Other for XHR requests other than GET/POST	Andrew White	2012-04-30	1	-0/+10
*	Merge pull request #5922 from rafaelfranca/deprecate_javascript_helpers	Jeremy Kemper	2012-04-29	9	-18/+40
\|\
\| *	Add release data to Rails 3.2.3	Rafael Mendonça França	2012-04-30	5	-5/+5
\| *	Add CHANGELOG entry.	Rafael Mendonça França	2012-04-30	1	-1/+6
\| *	Deprecate link_to_function and button_to_function helpers	Rafael Mendonça França	2012-04-30	2	-12/+28
\| *	Add missing require when helpers are used in isolation	Rafael Mendonça França	2012-04-30	1	-0/+1
\|/
*	Restore interpolation of path option in redirect routes	Andrew White	2012-04-29	2	-1/+50
*	Add missing require from b608cdd64c95d0d16eb98d86562e22f3b01be9e3	Andrew White	2012-04-29	1	-0/+1
*	Escape interpolated params when redirecting - fixes #5688	Andrew White	2012-04-29	2	-1/+34
*	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