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

	Commit message (Expand)	Author	Age	Files	Lines
*	We actually don't need a reverse_merge! here. dup removed was giving error wi...	Arun Agrawal	2011-08-12	1	-1/+1
*	when calling url_for with a hash, additional (likely unwanted) values (such a...	Andrew Kaspick	2011-08-11	1	-1/+1
*	x_sendfile_header now defaults to nil and production.rb env file doesn't	Santiago Pastorino	2011-08-07	1	-1/+1
*	document meta method	Vijay Dev	2011-08-04	1	-3/+3
*	Merge pull request #2327 from cesario/patch-1	José Valim	2011-07-28	1	-1/+0
\|\
\| *	We don't need to require erb here.	Franck Verrot	2011-07-28	1	-1/+0
* \|	Merge pull request #2330 from thedarkone/resources-router-fix	José Valim	2011-07-28	1	-8/+7
\|\ \ \| \|/ \|/\|
\| *	Make use of the inherited initializer.	thedarkone	2011-07-28	1	-3/+2
\| *	There is no need to be destructive with the passed-in options.	thedarkone	2011-07-28	1	-6/+6
* \|	simplify conditionals by assuming hash values will never be `false`	Aaron Patterson	2011-07-26	1	-10/+2
* \|	use regular ruby rather than clever ruby	Aaron Patterson	2011-07-26	1	-3/+3
* \|	fixing wildcard path matching when wildcard is inside parenthesis	Aaron Patterson	2011-07-26	1	-1/+1
* \|	Remove blank line	Santiago Pastorino	2011-07-26	1	-1/+0
* \|	refactored 'assert_redirected_to': local call to validate_request! will be ca...	thoefer	2011-07-26	1	-5/+4
* \|	Allow a route to have :format => true	Erik Michaels-Ober	2011-07-25	1	-0/+2
* \|	Merge pull request #2245 from davidtrogers/constraints_block_passed_to_follow...	Santiago Pastorino	2011-07-25	1	-6/+5
\|\ \
\| * \|	Ensure the constraints block is only applied to the correct route	Dave Rogers	2011-07-25	1	-6/+5
\| \|/
* /	Make polymorphic_url calls go through application helpers again.	thedarkone	2011-07-25	1	-8/+1
\|/
*	Check Accept and Content-Type headers before evaluating them in xhr requests....	ogeidix	2011-07-19	1	-1/+2
*	Better formatting of route requirements in rake:routes.	Hendy Tanata	2011-07-16	1	-7/+7
*	TODO fix explicitly loading exceptations, autoload removed	Vishnu Atrai	2011-07-11	4	-0/+4
*	provide a more explicit message when using url_for with nil	Damien Mathieu	2011-07-02	1	-1/+3
*	Add has_key? and key? methods to CookieJar removed in 0ca69ca65f83b4bb34f8	José Valim	2011-06-30	1	-0/+5
*	Revert "Delegate to @flashes with 'delegate' instead of manually."	Aaron Patterson	2011-06-29	1	-2/+24
*	Delegate to @flashes with 'delegate' instead of manually.	Ben Orenstein	2011-06-29	1	-24/+2
*	Fix test to use Mime::Zip	Arun Agrawal	2011-06-28	1	-3/+3
*	Register some commonly used mime types (png, jpeg, pdf, zip etc.) per default	Esad Hajdarevic	2011-06-28	1	-0/+12
*	Get the fixture_path from self.class instead of ActiveSupport::TestCase.	David Chelimsky	2011-06-25	1	-1/+1
*	Remove usage of memoizable from ActionPack.	José Valim	2011-06-16	1	-3/+3
*	Also change the default route comment	Wen-Tien Chang	2011-06-16	1	-1/+1
*	Removed warning while running test with ruby 1.9.2	bagwanpankaj	2011-06-14	1	-1/+1
*	all requests are utf-8. Don't use the external encoding.	Damien Mathieu	2011-06-14	1	-3/+2
*	encode the uploaded file's name in the default external encoding - Closes #869	Damien Mathieu	2011-06-14	1	-1/+12
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-06-11	1	-3/+3
\|\
\| *	shallow_path example updated	ganesh	2011-06-10	1	-3/+3
* \|	Merge pull request #1523 from raghunadhd/refactor_regex	Xavier Noria	2011-06-10	1	-4/+7
\|\ \
\| * \|	removed the unnecessary back slashes from the regular expression	Raghunadh	2011-06-10	1	-2/+2
\| * \|	rafactored the regex related code in the mapper class	Raghunadh	2011-06-07	1	-4/+7
\| \|/
* /	remove warning: assigned but unused variable	Santiago Pastorino	2011-06-08	2	-4/+1
\|/
*	Add backward compatibility for testing cookies	Andrew White	2011-06-05	2	-2/+8
*	Ensure cookie keys are strings	Andrew White	2011-06-05	1	-2/+3
*	Add missing require for cookies middleware	Andrew White	2011-06-04	1	-0/+1
*	Refactor ActionController::TestCase cookies	Andrew White	2011-06-04	3	-26/+11
*	fix creating an empty route on 1.8. Closes #1210	Damien Mathieu	2011-06-01	1	-1/+3
*	Corrected some typos and American vs. Queen's English issues	Lee Reilly	2011-05-29	1	-4/+4
*	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-05-25	7	-24/+24
\|\
\| *	Remove extra white spaces on ActionPack docs.	Sebastian Martinez	2011-05-23	7	-18/+18
\| *	Fixed documentation for scope with path.	Anuj Dutta	2011-05-22	1	-2/+2
\| *	fixes code highlight in shallow_path example	Diego Plentz	2011-05-19	1	-4/+4
* \|	removed deprecated methods, and related tests, from ActionPack	Josh Kalderimis	2011-05-24	5	-46/+3