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

	Commit message (Expand)	Author	Age	Files	Lines
*	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	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.	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 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	dmathieu	2011-05-24	3	-4/+4
* \| \|	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	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
\|\ \
\| * \|	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
\|\ \ \| \|/ \|/\|
\| *	Parenthesize arguments when the first one is a Regexp literal.	Sebastian Martinez	2011-05-23	3	-13/+13
* \|	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 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 over...	wycats	2011-05-23	3	-55/+56
* \|	Start moving some logic from being embedded in AV into the Rails Sprockets ex...	wycats	2011-05-23	5	-62/+60
\|/
*	fixing 1.8 support for new fixture tests	Aaron Patterson	2011-05-23	3	-4/+9
*	removing CSV fixture support	Aaron Patterson	2011-05-23	2	-58/+10
*	fixture file will validate fixture format	Aaron Patterson	2011-05-23	2	-1/+26
*	return an empty array for empty yaml files	Aaron Patterson	2011-05-23	2	-1/+20
*	use top level file constant for join, etc	Aaron Patterson	2011-05-23	1	-4/+4
*	adding AR::Fixtures::File class to wrap a fixture file	Aaron Patterson	2011-05-23	3	-0/+90
*	Removed ActiveSupport::SecureRandom in favour of SecureRandom from the standa...	Jon Leighton	2011-05-23	7	-29/+8
*	Replace references to ActiveSupport::SecureRandom with just SecureRandom, and...	Jon Leighton	2011-05-23	13	-20/+22
*	Merge pull request #1231 from joshk/ruby-debugger	José Valim	2011-05-23	9	-45/+47
\|\
\| *	Removed the AS core_ext/kernel/debugger breakpoint method as this method is a...	Josh Kalderimis	2011-05-23	2	-10/+44
\| *	Removed AS core_ext/kernel/requires as it's not used and is bad practice.	Josh Kalderimis	2011-05-23	7	-35/+3
* \|	Merge pull request #1230 from smartinez87/changelog	José Valim	2011-05-23	1	-0/+2
\|\ \ \| \|/ \|/\|
\| *	Add entry to AP changelog	Sebastian Martinez	2011-05-23	1	-0/+2
\|/
*	Merge pull request #1228 from fcheung/db_time_fix2	José Valim	2011-05-23	2	-1/+29
\|\
\| *	Take into account time spent in AR even if a redirect occurs or if it is afte...	Frederick Cheung	2011-05-23	2	-1/+29
* \|	Move content length to the server, this brings the same behavior as in rack 1.2.	José Valim	2011-05-23	3	-9/+7
* \|	Require rubygems (chill out, just for rails internal tests).	José Valim	2011-05-23	1	-0/+1
* \|	Merge pull request #1184 from gnufied/master	Aaron Patterson	2011-05-23	1	-0/+1
\|\ \
\| * \|	fix connection not established error while running rake task	Bhavin Kamani	2011-05-21	1	-0/+1
* \| \|	Bump Rack version	wycats	2011-05-22	1	-1/+1
* \| \|	Eliminate uninitialized instance variable warning	wycats	2011-05-22	1	-2/+2
* \| \|	Prepare the context in URLHelperTest so that there are no required uninitiali...	wycats	2011-05-22	1	-0/+2
* \| \|	Merge pull request #1222 from arunagw/sprockets-fixes	José Valim	2011-05-22	2	-8/+0
\|\ \ \
\| * \| \|	We don't need to load version any more as Sprockets.beta8 is included.	Arun Agrawal	2011-05-23	2	-8/+0