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

	Commit message (Expand)	Author	Age	Files	Lines
*	test case to assert that associations do not overwrite after create, fixes #9310	Jon Rowe	2013-03-24	1	-0/+13
*	Fix test to Ruby 1.8	Rafael Mendonça França	2013-03-21	1	-1/+1
*	Improve CHANGELOG entry [ci skip]	Rafael Mendonça França	2013-03-21	1	-1/+5
*	Merge branch '3-2-stable' into fredwu-slow_view_loading_fix	Aaron Patterson	2013-03-20	6	-2/+32
\|\
\| *	Merge pull request #9802 from newsline/fix-broken-action-missing	Rafael Mendonça França	2013-03-20	3	-1/+18
\| *	Remove bad changelog entry from AR [ci skip]	Carlos Antonio da Silva	2013-03-20	1	-3/+0
\| *	Wrong exception is occured when raising no translatable exception	kennyj	2013-03-20	3	-0/+16
\| *	Don't crash exception translation w/ nil result attribute.	Steve Jorgensen	2013-03-20	1	-1/+1
* \|	Added changelog for 687e68d	Fred Wu	2013-03-21	1	-0/+6
* \|	Fixed assets loading performance in 3.2.13	Fred Wu	2013-03-20	2	-1/+10
\|/
*	Be consistent with quotes in smtp example guide [ci skip]	Carlos Antonio da Silva	2013-03-19	1	-1/+1
*	Merge pull request #9796 from dembskoi/clone_structure	Rafael Mendonça França	2013-03-19	2	-0/+8
\|\
\| *	Reset postgreSQL search path in db:test:clone_structure.	Alexander	2013-03-19	2	-0/+8
* \|	Merge pull request #9804 from samsonasu/backport_number_to_human_fixes	Rafael Mendonça França	2013-03-19	3	-1/+20
\|\ \ \| \|/ \|/\|
\| *	Backport #9347 to rails 3.2	hoffm	2013-03-19	3	-1/+20
\|/
*	Merge pull request #9789 from puma/3-2-stable	José Valim	2013-03-18	1	-1/+1
\|\
\| *	Change @env_config to @app_env_config	Evan Phoenix	2013-03-18	1	-1/+1
\|/
*	Merge pull request #9785 from claudiob/add-3-2-13-release-date-to-changelogs	Rafael Mendonça França	2013-03-18	7	-8/+8
\|\
\| *	Add release dates to documentation [ci skip]	claudiob	2013-03-18	7	-8/+8
\|/
*	Bring back test and changelog entry from #pluck method and select clause	Carlos Antonio da Silva	2013-03-18	2	-0/+16
*	Fix method name indent [ci skip]	Carlos Antonio da Silva	2013-03-18	1	-1/+1
*	Fix changelog conflicts and remove release dates [ci skip]	Carlos Antonio da Silva	2013-03-18	3	-14/+8
*	Merge branch '3-2-13' into 3-2-stable	Aaron Patterson	2013-03-18	28	-50/+98
\|\
\| *	bumping to 3.2.13	Aaron Patterson	2013-03-18	9	-9/+9
\| *	fix protocol checking in sanitization [CVE-2013-1857]	Aaron Patterson	2013-03-15	2	-2/+12
\| *	JDOM XXE Protection [CVE-2013-1856]	Ben Murphy	2013-03-15	5	-3/+45
\| *	fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]	Charlie Somerville	2013-03-15	2	-3/+8
\| *	stop calling to_sym when building arel nodes [CVE-2013-1854]	Aaron Patterson	2013-03-15	4	-10/+10
\| *	Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets	Carlos Antonio da Silva	2013-03-12	3	-1/+26
\| *	bumping to rc2	Aaron Patterson	2013-03-06	9	-9/+9
\| *	Revert "Merge pull request #8209 from senny/backport_8176"	Aaron Patterson	2013-03-05	2	-21/+0
\| *	Freeze columns only once per Result	Santiago Pastorino	2013-03-05	1	-3/+9
\| *	Preparing for 3.2.13.rc1 release	Steve Klabnik	2013-02-27	9	-17/+17
\| *	Update CHANGELOGs for 3.2.13 release.	Steve Klabnik	2013-02-27	7	-0/+35
* \|	Merge pull request #9768 from senny/do_not_freeze_number_helper_defaults	Carlos Antonio da Silva	2013-03-18	1	-2/+2
\|\ \
\| * \|	do not freeze NumberHelper defaults.	Yves Senn	2013-03-18	1	-2/+2
\|/ /
* \|	Typo fix [ci ski]	Justin	2013-03-15	1	-2/+2
* \|	Merge pull request #7368 from jbarreneche/bug/render-locale-fallbacks	Steve Klabnik	2013-03-14	3	-1/+21
\|\ \
\| * \|	Extract hardcoded lists to Redo::RestaurantsList	Juan Barreneche	2013-03-14	3	-1/+21
\|/ /
* \|	Fix ar:mysql2 build on Ruby 1.8.7	Andrew White	2013-03-13	1	-4/+12
* \|	Fix `ActiveSupport::TimeZone.parse` when time is a local DST jump	Andrew White	2013-03-13	3	-7/+76
* \|	Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets	Carlos Antonio da Silva	2013-03-09	3	-2/+27
* \|	Merge pull request #9613 from arunagw/remove_fixme	Carlos Antonio da Silva	2013-03-08	1	-9/+8
\|\ \
\| * \|	Removing FIXME	Arun Agrawal	2013-03-08	1	-9/+8
* \| \|	Merge pull request #9609 from arunagw/using-latest-arjdbc	Carlos Antonio da Silva	2013-03-08	1	-3/+3
\|\ \ \
\| * \| \|	Using latest AR-JDBC for JRuby	Arun Agrawal	2013-03-08	1	-3/+3
\| \|/ /
* \| \|	Merge pull request #9600 from larrylv/fix-load-target-with-identity-map-on	Rafael Mendonça França	2013-03-07	1	-3/+8
\|\ \ \
\| * \| \|	@target might be nil when Identity Map is enabled.	Larry Lv	2013-03-08	1	-3/+8
\|/ / /
* \| \|	Merge pull request #9549 from larrylv/reload-stable-target-before-saving	Rafael Mendonça França	2013-03-07	6	-6/+28
\|\ \ \
\| * \| \|	Fix issue #7526. Reload the target if it's stale.	larrylv	2013-03-05	6	-6/+28