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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #7025 from rustygeldmacher/select_options_valid_html	Rafael Mendonça França	2012-07-10	2	-5/+18
\|\
\| *	Fixed bug creating invalid HTML in select options	Rusty Geldmacher	2012-07-10	2	-5/+18
\|/
*	Merge pull request #7015 from sikachu/3-2-stable-code-style	Xavier Noria	2012-07-09	1	-8/+8
\|\
\| *	Update coding convention from master	Prem Sichanugrist	2012-07-09	1	-8/+8
\|/
*	Merge pull request #6985 from sidonath/disable-query-cache-for-locks	Rafael Mendonça França	2012-07-06	2	-1/+17
*	Since Rails 3.2, use layout false to render no layout	José Valim	2012-07-06	1	-1/+1
*	Merge pull request #6973 from route/wrapped_keys_in_log_for_3_2	Rafael Mendonça França	2012-07-05	2	-1/+10
\|\
\| *	Show in log correct wrapped keys	Dmitry Vorotilin	2012-07-05	2	-1/+10
\|/
*	Fix NumberHelper options wrapping to prevent verbatim blocks being rendered i...	Mark J. Titorenko	2012-07-02	1	-90/+159
*	Merge pull request #6935 from frodsan/b1e509ad7a8c8264544f10f4666705cd806b5408	Rafael Mendonça França	2012-07-02	2	-15/+31
\|\
\| *	Backport #3329 to 3-2-stable	Francesco Rodriguez	2012-07-02	2	-15/+31
\|/
*	make sure the inflection rules are loaded when cherry-picking active_support/...	Xavier Noria	2012-06-29	3	-0/+5
*	Merge pull request #6878 from masarakki/master	Rafael Mendonça França	2012-06-28	5	-0/+41
*	Merge pull request #6900 from cbandy/issue-6898	Carlos Antonio da Silva	2012-06-28	1	-0/+2
*	Merge pull request #6857 from rsutphin/as_core_ext_time_missing_require	Carlos Antonio da Silva	2012-06-25	1	-0/+1
*	Ensure Arel columns are typecasted properly when grouping with calculation	Carlos Antonio da Silva	2012-06-25	2	-5/+9
*	Merge pull request #6842 from ernie/handle-non-strings-in-grouped-calculations	Rafael Mendonça França	2012-06-24	2	-6/+22
*	Remove waning of unused variable	Rafael Mendonça França	2012-06-21	1	-1/+0
*	Merge branch 'acapilleri-update_nested_attributes'	Rafael Mendonça França	2012-06-21	2	-5/+25
*	Merge pull request #6758 from caironoleto/master	José Valim	2012-06-18	1	-13/+13
*	Merge pull request #6649 from route/logger_in_metal_3_2	Carlos Antonio da Silva	2012-06-18	2	-2/+21
\|\
\| *	Added test for case when view doesn't have logger method when using ActionCon...	Dmitry Vorotilin	2012-06-16	1	-0/+17
\| *	ActionController::Metal doesn't have logger method, check it and then delegate	Dmitry Vorotilin	2012-06-16	1	-2/+4
* \|	Merge pull request #6742 from steveklabnik/deprecate_composed_of	Rafael Mendonça França	2012-06-18	5	-7/+24
\|\ \
\| * \|	Deprecating composed_of in ActiveRecord	Steve Klabnik	2012-06-18	5	-7/+24
\| \|/
* \|	Use strict_args_position! if available from Thor	José Valim	2012-06-18	1	-0/+1
* \|	Merge pull request #6764 from frodsan/patch-4	Rafael Mendonça França	2012-06-17	1	-2/+2
\|\ \
\| * \|	bump AS deprecation_horizon to 4.0	Francesco Rodríguez	2012-06-17	1	-2/+2
\|/ /
* \|	Merge pull request #6756 from arunagw/build_fix_ap	Rafael Mendonça França	2012-06-16	1	-1/+1
\|\ \
\| * \|	It should also include text/css => Build Fix	Arun Agrawal	2012-06-16	1	-1/+1
\|/ /
* /	Merge pull request #6752 from steveklabnik/fix_5680	Rafael Mendonça França	2012-06-16	3	-4/+21
\|/
*	Remove unneded tests.	Rafael Mendonça França	2012-06-14	1	-11/+1
*	registers the deprecation of update_attribute in the CHANGELOG	Xavier Noria	2012-06-14	1	-0/+8
*	Merge pull request #6739 from steveklabnik/3-2-stable	Xavier Noria	2012-06-14	7	-17/+41
\|\
\| *	Deprecate update_attribute.	Steve Klabnik	2012-06-14	7	-17/+41
* \|	adding a test for #6459	Aaron Patterson	2012-06-14	1	-0/+10
\|/
*	ActionController::Caching depends on RackDelegation and AbstractController::C...	Santiago Pastorino	2012-06-13	2	-0/+35
*	Merge pull request #6716 from frodsan/patch-2	Rafael Mendonça França	2012-06-12	1	-1/+1
\|\
\| *	Fix build	Francesco Rodríguez	2012-06-12	1	-1/+1
\|/
*	Merge branch '3-2-stable-rel' into 3-2-stable	Aaron Patterson	2012-06-12	20	-16/+58
\|\
\| *	updating changelogs	Aaron Patterson	2012-06-12	7	-7/+11
\| *	bumping version numbers	Aaron Patterson	2012-06-11	9	-9/+9
\| *	updating changelogs with security fixes	Aaron Patterson	2012-06-11	2	-0/+6
\| *	updating changelogs	Aaron Patterson	2012-06-11	5	-0/+20
\| *	Array parameters should not contain nil values.	Aaron Patterson	2012-06-11	2	-2/+8
\| *	Additional fix for CVE-2012-2661	Ernie Miller	2012-06-11	2	-3/+9
* \|	Merge pull request #6715 from arunagw/add_asserts	Rafael Mendonça França	2012-06-12	1	-2/+2
* \|	Merge pull request #6676 from aurelian/master	Rafael Mendonça França	2012-06-12	2	-1/+5
* \|	Merge pull request #6682 from acapilleri/dup_validation_fix_backport_for_1_9_3	Rafael Mendonça França	2012-06-12	3	-1/+16
\|\ \ \| \|/ \|/\|
\| *	Fix the the backport of the object dup with the ruby 1.9.3p194.	Angelo capilleri	2012-06-12	3	-1/+16