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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #1254 from pixeltrix/ignore-includes-in-through-scope	Jon Leighton	2011-05-24	4	-1/+16
\|\ \| \| \| \|	Ignore :includes on through associations
\| *	Ignore :includes on through associations	Andrew White	2011-05-24	4	-1/+16
\| \|
* \|	Ensure that the surrounding code in Relation#to_a respects the default_scope ↵	Jon Leighton	2011-05-24	1	-17/+24
\| \| \| \| \| \| \| \|	(as well as having Relation#arel respect the default scope). Fixes #1233.
* \|	Failing tests for #1233.	Andrew White	2011-05-24	2	-0/+75
\| \|
* \|	Merge pull request #1279 from dasch/patch-2	José Valim	2011-05-24	1	-1/+1
\|\ \ \| \| \| \| \| \|	Use quotes consistently in Gemfile
\| * \|	Also use double quotes for #source	Daniel Schierbeck	2011-05-24	1	-1/+1
\| \| \|
* \| \|	Merge pull request #1279 from dasch/patch-2	José Valim	2011-05-24	1	-7/+7
\|\\| \| \| \| \| \| \| \|	Use quotes consistently in Gemfile
\| * \|	Use quotes consistently in Gemfile	Daniel Schierbeck	2011-05-24	1	-7/+7
\|/ /
* \|	Merge pull request #1239 from alindeman/master	José Valim	2011-05-24	1	-4/+4
\|\ \ \| \| \| \| \| \|	Use set data structure to speed up circular reference checks on large/deeply nested objects
\| * \|	Use set data structure to speed up circular reference checks on large/deeply ↵	Andy Lindeman	2011-05-23	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|	nested objects
* \| \|	Merge pull request #1278 from vijaydev/rake-doctask-warning-fix	José Valim	2011-05-24	5	-10/+10
\|\ \ \ \| \| \| \| \| \| \| \|	Fixes Rake::RDocTask deprecation warnings from Rake 0.9.0
\| * \| \|	fixes Rake::RDocTask deprecation warnings from rake 0.9.0	Vijay Dev	2011-05-25	5	-10/+10
\|/ / /
* \| \|	Merge pull request #1274 from vijaydev/rake-packagetask-warning-fix	José Valim	2011-05-24	7	-14/+14
\|\ \ \ \| \| \| \| \| \| \| \|	Fixes for Rake::GemPackageTask deprecation warnings from Rake 0.9.0
\| * \| \|	fixes Rake::GemPackageTask deprecation warnings from rake 0.9.0	Vijay Dev	2011-05-24	7	-14/+14
\| \| \| \|
* \| \| \|	rescue record invalid exceptions and return false from the save method. ↵	Aaron Patterson	2011-05-24	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes #796
* \| \| \|	add tests surrounding behavior of save and save! for associations that have ↵	Aaron Patterson	2011-05-24	1	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	validation errors
* \| \| \|	adding a test for create! with invalid associations	Aaron Patterson	2011-05-24	1	-0/+9
\| \| \| \|
* \| \| \|	do not bother with assert_nothing_raised, the test will fail and we get a ↵	Aaron Patterson	2011-05-24	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	better trace without it
* \| \| \|	Add failing test case for issue 796	Joey Butler	2011-05-24	1	-0/+9
\|/ / /
* \| \|	Merge pull request #1271 from joshk/remove_am_deprecated_methods	José Valim	2011-05-24	10	-1667/+6
\|\ \ \ \| \| \| \| \| \| \| \|	Removed deprecated ActionMailer API and related tests
\| * \| \|	Removed deprecated ActionMailer API and related tests	Josh Kalderimis	2011-05-24	10	-1667/+6
\| \| \| \|
* \| \| \|	Merge pull request #1247 from arunagw/loading-file	Aaron Patterson	2011-05-24	1	-83/+82
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Not loading file if PLATFORM not available.
\| * \| \| \|	Not loading file if PLATFORM not available.	Arun Agrawal	2011-05-24	1	-83/+82
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1253 from arunagw/preformance_java_import	Aaron Patterson	2011-05-24	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	import to java_import.
\| * \| \| \| \|	import to java_import.	Arun Agrawal	2011-05-24	1	-1/+1
\| \|/ / / /
* \| \| \| \|	Merge pull request #1251 from arunagw/java_import	Aaron Patterson	2011-05-24	1	-6/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Using java_import instead of import. Need to do this with rake 0.9.0 #jruby
\| * \| \| \| \|	Using java_import instead of import. Need to do this with rake 0.9.0 #jruby	Arun Agrawal	2011-05-24	1	-6/+6
\| \|/ / / /
* \| / / /	Remove asserts for js ext stuff thats not used any more	David Heinemeier Hansson	2011-05-24	1	-3/+0
\| \|/ / / \|/\| \| \|
* \| \| \|	Merge pull request #1268 from ernie/compute_asset_host_fix	José Valim	2011-05-24	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Redundant condition in compute_asset_host is redundant.
\| * \| \| \|	Redundant condition in compute_asset_host is redundant.	Ernie Miller	2011-05-24	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1267 from guilleiguaran/prefer-each-syntax	José Valim	2011-05-24	2	-2/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Prefer 'each' syntax instead of 'for in'
\| * \| \| \|	Prefer each instead of for on activesupport	Guillermo Iguaran	2011-05-24	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Prefer each instead of for in activeresource	Guillermo Iguaran	2011-05-23	1	-1/+1
\| \|/ / /
* \| \| \|	The asset pipeline is always on for new apps, dont need the legacy js ext stuff	David Heinemeier Hansson	2011-05-24	1	-11/+0
\| \| \| \|
* \| \| \|	Merge pull request #1257 from dmathieu/yml_alias	David Heinemeier Hansson	2011-05-24	3	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Properly reference yml alias nodes
\| * \| \| \|	properly reference yml alias nodes	dmathieu	2011-05-24	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as per the last version of the yml specifications : http://www.yaml.org/spec/1.2/spec.html#* alias//
* \| \| \| \|	Merge pull request #1262 from dmathieu/dummy_without_tests	José Valim	2011-05-24	2	-1/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Create the dummy app if there's no test_unit but there's a dummy_path
\| * \| \| \| \|	create the dummy app if there's no test_unit but there's a dummy_path	dmathieu	2011-05-24	2	-1/+8
\|/ / / / /
* / / / /	Fix failing test suite (please run tests before sending pull requests :S)	José Valim	2011-05-24	1	-1/+2
\|/ / / /
* \| \| \|	Remaining cleanup from changes to AssetTagHelper	tomhuda	2011-05-24	4	-12/+9
\| \| \| \|
* \| \| \|	Merge pull request #1255 from flippingbits/master	José Valim	2011-05-24	2	-1/+7
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|	Fix gemspec of full or mountable engines
\| * \| \|	Add test for gemspec of the generated engine	Stefan Sprenger	2011-05-24	1	-0/+6
\| \| \| \|
\| * \| \|	Add folders app and config to the engine's gemspec if they're available	Stefan Sprenger	2011-05-24	1	-1/+1
\|/ / /
* \| \|	Merge pull request #1243 from smartinez87/warnings	José Valim	2011-05-23	3	-13/+13
\|\ \ \ \| \|/ / \|/\| \|	Fix 'warning: ambiguous first argument; put parentheses or even spaces'.
\| * \|	Parenthesize arguments when the first one is a Regexp literal.	Sebastian Martinez	2011-05-23	3	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \|	This fixes 'warning: ambiguous first argument; put parentheses or even spaces'.
* \| \|	Make sure that Sprockets::Helpers::RailsHelper can be found	wycats	2011-05-23	2	-1/+8
\|/ /
* \|	Merge pull request #1241 from smartinez87/extra-space	Santiago Pastorino	2011-05-23	7	-8/+8
\|\ \ \| \| \| \| \| \|	Remove extra white-space on exception message.
\| * \|	Remove extra white-space on some exception messages.	Sebastian Martinez	2011-05-23	7	-8/+8
\| \| \|
* \| \|	Move the last pockets of Sprockets stuff into the Sprockets directory	wycats	2011-05-23	5	-25/+16
\| \| \|
* \| \|	Move javascript/css helpers into the Sprockets helper and just have them ↵	wycats	2011-05-23	3	-55/+56
\| \| \| \| \| \| \| \| \| \| \| \|	override the old behavior