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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #332 from cmeiklejohn/bug6230_optimistic_locking_double_qu...	Jon Leighton	2011-05-08	5	-2/+52
\|\
\| *	Don't quote ID's as Arel will quote them -- follow same conventions as the de...	Christopher Meiklejohn	2011-05-08	5	-2/+52
\|/
*	Merge pull request #445 from prakashmurthy/lighthouse_6334	Aaron Patterson	2011-05-08	1	-0/+10
\|\
\| *	Lighthouse ticket # 6334; added tests to verify that spaces in key are dasher...	prakashmurthy	2011-05-08	1	-0/+10
* \|	Merge pull request #455 from joshk/mass_assignment_roles	José Valim	2011-05-08	6	-64/+64
\|\ \
\| * \|	renamed mass-assignment scopes to roles, updated code, tests, docs and securi...	Josh Kalderimis	2011-05-08	6	-64/+64
\|/ /
* \|	Merge pull request #388 from smartinez87/remove_method	José Valim	2011-05-08	1	-2/+3
\|\ \ \| \|/ \|/\|
\| *	Better use #remove_possible_method here	Sebastian Martinez	2011-05-08	1	-2/+3
* \|	prepend the assets route instead of appending, closes #436	José Valim	2011-05-08	5	-8/+37
* \|	Merge pull request #454 from dlee/nested_indifferent_access	José Valim	2011-05-08	5	-5/+35
\|\ \
\| * \|	indifferent access should recurse Hash subclasses	David Lee	2011-05-08	5	-5/+35
* \| \|	Revert to use === only here because of perf. :(	José Valim	2011-05-08	1	-3/+1
* \| \|	Merge pull request #420 from burke/master	José Valim	2011-05-08	3	-1/+14
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Added activesupport requires for Array.wrap in previously modified files	Burke Libbey	2011-05-07	2	-0/+3
\| * \|	Remove redundant check for is_a?(String)	Burke Libbey	2011-05-06	2	-2/+2
\| * \|	Added a test for MissingTemplate change, and changed to use Array.wrap() as	Burke Libbey	2011-05-06	3	-2/+11
\| * \|	Made ActionView::MissingTemplate#initialize optionally accept a single string	Burke Libbey	2011-05-06	1	-0/+1
* \| \|	Merge pull request #430 from dlee/methodoverride	José Valim	2011-05-08	5	-5/+53
\|\ \ \
\| * \| \|	Logs should show overridden method; Issue 426	David Lee	2011-05-07	5	-5/+53
* \| \| \|	Fix failing xml mini test.	José Valim	2011-05-08	1	-1/+4
* \| \| \|	Merge pull request #452 from jrom/runner-r-alias	José Valim	2011-05-08	1	-1/+2
\|\ \ \ \
\| * \| \| \|	Add alias `r` for rails runner	Jordi Romero	2011-05-07	1	-1/+2
\|/ / / /
* \| \| \|	Merge pull request #449 from msgehard/rename_duplicate_test_methods	Santiago Pastorino	2011-05-07	2	-2/+2
\|\ \ \ \
\| * \| \| \|	Rename duplicate tests. There is now one failing test that was failing befor...	Mike Gehard	2011-05-07	2	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #442 from jasonnoble/namespace_fixtures	Aaron Patterson	2011-05-07	8	-318/+323
\|\ \ \ \
\| * \| \| \|	Added deprecation warning for Fixture(s) (Use ActiveRecord::Fixture(s))	Jason Noble	2011-05-07	1	-0/+3
\| * \| \| \|	Namespace Fixtures in ActiveRecord	Jason Noble	2011-05-07	8	-318/+320
* \| \| \| \|	Revert "Merge pull request #275 from pk-amooma/master"	José Valim	2011-05-07	2	-14/+2
* \| \| \| \|	Always expand /	José Valim	2011-05-07	2	-8/+5
* \| \| \| \|	Fixes ticket #6379. Improved the handling of Accept headers containing /.	mathieuravaux	2011-05-07	2	-4/+12
* \| \| \| \|	xml_mini_test.rb now runs.	José Valim	2011-05-07	2	-8/+1
* \| \| \| \|	Merge pull request #438 from jasonmichaelroth/ordinalize_negative_numbers	Aaron Patterson	2011-05-07	2	-2/+32
\|\\| \| \| \|
\| * \| \| \|	ordinalize negative numbers patch	Jason	2011-05-07	2	-2/+32
\|/ / / /
* \| \| \|	Merge pull request #435 from vijaydev/master	Xavier Noria	2011-05-07	1	-5/+10
\|\ \ \ \
\| * \| \| \|	update readme to reflect app/assets	Vijay Dev	2011-05-07	1	-5/+10
\|/ / / /
* \| \| \|	Merge pull request #434 from arunagw/changelog_doc	José Valim	2011-05-07	1	-0/+12
\|\ \ \ \
\| * \| \| \|	Updated change log for jdbc* adapters template.	Arun Agrawal	2011-05-07	1	-0/+12
* \| \| \| \|	Class.new.name returns an empty string on 1.8	José Valim	2011-05-07	1	-1/+1
* \| \| \| \|	Revert "Revert the merge because tests did not pass."	José Valim	2011-05-07	3	-5/+44
\|/ / / /
* \| \| \|	Update CHANGELOG.	José Valim	2011-05-07	1	-0/+2
* \| \| \|	Merge pull request #343 from asanghi/ampm	José Valim	2011-05-07	2	-4/+85
\|\ \ \ \
\| * \| \| \|	DRY this baby up	Aditya Sanghi	2011-04-29	1	-23/+4
\| * \| \| \|	add more documentation; remove unused assignment	Aditya Sanghi	2011-04-29	1	-4/+14
\| * \| \| \|	Allow AM/PM in datetime selectors	Aditya Sanghi	2011-04-29	2	-0/+90
* \| \| \| \|	Merge pull request #286 from jasoncodes/marshal_subsec	José Valim	2011-05-07	2	-0/+8
\|\ \ \ \ \
\| * \| \| \| \|	Fix marshal round-tripping of fractional seconds (Time#subsec).	Jason Weathered	2011-04-17	2	-0/+8
* \| \| \| \| \|	ADdd missing requires (thanks to @arunagw)	José Valim	2011-05-07	2	-1/+2
* \| \| \| \| \|	Merge pull request #280 from jballanc/frozen-string-strip-tags	José Valim	2011-05-07	2	-1/+2
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix for stripping tags from frozen strings.	Joshua Ballanco	2011-04-14	1	-1/+1
\| * \| \| \| \| \|	Test for stripping tags from a frozen string.	Joshua Ballanco	2011-04-14	1	-0/+1