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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #2324 from zenapsis/3-1-stable	Santiago Pastorino	2011-08-01	3	-3/+21
*	Merge pull request #2393 from bdurand/fix_cache_read_multi	Santiago Pastorino	2011-08-01	2	-1/+9
\|\
\| *	Pass options in ActiveSupport::Cache::CacheStore#read_multi through to the de...	Brian Durand	2011-08-01	2	-1/+9
* \|	Merge pull request #2389 from dmitriy-kiriyenko/remove_unnecessary_require_in...	Santiago Pastorino	2011-08-01	1	-2/+0
\|\ \
\| * \|	Remove unnecessary require (happened after fcbde454f6)	Dmitriy Kiriyenko	2011-08-01	1	-2/+0
\|/ /
* \|	Merge pull request #2385 from bogdan/test_default_sanitizer2	José Valim	2011-08-01	3	-1/+19
\|\ \
\| * \|	MassAssignmentProtection: consider 'id' insensetive in StrictSanitizer	Bogdan Gusiev	2011-07-28	3	-1/+19
* \| \|	Fix the issue where default_url_options is being cached on test cases. Closes...	thoefer	2011-08-01	3	-0/+35
* \| \|	Rename new method to_path to to_partial_path to avoid conflicts with File#to_...	José Valim	2011-08-01	10	-28/+28
* \| \|	Merge pull request #2379 from arunagw/extra_require_removal	Santiago Pastorino	2011-07-31	6	-6/+0
\|\ \ \
\| * \| \|	Removing extra requires from the test. Already loaded in abstract_unit.	Arun Agrawal	2011-07-31	6	-6/+0
* \| \| \|	Merge pull request #2377 from castlerock/remove_require	Santiago Pastorino	2011-07-31	1	-1/+0
\|\ \ \ \
\| * \| \| \|	remove extra require for 'active_support/dependencies' as it is required in a...	Vishnu Atrai	2011-07-31	1	-1/+0
\|/ / / /
* \| \| \|	Merge pull request #2370 from castlerock/remove_duplicate_require	Santiago Pastorino	2011-07-31	1	-1/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	remove extra require for 'stringio' as it is required in helper.rb	Vishnu Atrai	2011-07-31	1	-1/+0
* \| \| \|	Merge pull request #2375 from vijaydev/rakeaboutfix	José Valim	2011-07-31	1	-1/+1
\|\ \ \ \
\| * \| \| \|	fixes #2368. rake about not showing the middleware, db adapter and db schema ...	Vijay Dev	2011-07-31	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #2371 from bradediger/issue-2346	Jon Leighton	2011-07-31	1	-2/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	remove_possible_method: test if method exists	Brad Ediger	2011-07-31	1	-2/+7
* \| \| \|	Merge pull request #2358 from arunagw/test_fix_187_skip	José Valim	2011-07-31	1	-3/+4
\|\ \ \ \
\| * \| \| \|	magic comment test only if encoding_aware?.	Arun Agrawal	2011-07-30	1	-3/+4
* \| \| \| \|	Merge pull request #2345 from castlerock/plugin_new_generator_more_default_file	Santiago Pastorino	2011-07-30	1	-0/+2
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Covering more files in test for plugin new generator.	Vishnu Atrai	2011-07-29	1	-0/+2
* \| \| \| \|	Merge pull request #2364 from bcardarella/resolve_undefined_instance_attribut...	José Valim	2011-07-30	1	-0/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Resolve warnings by instantizing @attrubtes as nil	Brian Cardarella	2011-07-30	1	-0/+1
\|/ / / /
* \| \| \|	Merge pull request #2354 from waynn/patch-1	Santiago Pastorino	2011-07-29	1	-2/+2
\|\ \ \ \
\| * \| \| \|	remove redundant calls to stringify_keys	Waynn Lue	2011-07-29	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #2353 from bdurand/no_freeze_cache_entries	Aaron Patterson	2011-07-29	2	-22/+18
\|\ \ \ \
\| * \| \| \|	Change ActiveSupport::Cache behavior to always return duplicate objects inste...	Brian Durand	2011-07-29	2	-22/+18
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	delay backtrace scrubbing until we actually raise an exception. fixes #1936	Aaron Patterson	2011-07-29	1	-7/+4
* \| \| \|	default writing the schema file as utf-8	Aaron Patterson	2011-07-29	1	-1/+2
* \| \| \|	dump IO encoding value along with schema.rb so the file can be reloaded. fixe...	Aaron Patterson	2011-07-29	2	-3/+16
* \| \| \|	Merge pull request #2342 from bcardarella/remove_controller_instance_variable...	Santiago Pastorino	2011-07-29	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Instead of removing the instance variable just set it to nil, resolves the wa...	Brian Cardarella	2011-07-29	1	-2/+2
* \| \| \| \|	Merge pull request #2344 from bcardarella/resolve_warning_for_capture_helper_...	Aaron Patterson	2011-07-29	2	-0/+12
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Reset @dirty to false when slicing an instance of SafeBuffer	Brian Cardarella	2011-07-29	2	-0/+12
\| \|/ / /
* \| \| \|	Merge pull request #2343 from arunagw/test_add_for_plugin_new_gen	José Valim	2011-07-29	1	-4/+5
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Test add for plugin new generator generate mailer	Arun Agrawal	2011-07-29	1	-4/+5
\|/ / /
* \| \|	Merge pull request #2339 from dgeb/mailers-in-plugins	José Valim	2011-07-29	2	-0/+1
\|\ \ \
\| * \| \|	Include empty app/mailers directory in mountable and full plugins	Dan Gebhardt	2011-07-29	2	-0/+1
\|/ / /
* / /	Tidy up	Santiago Pastorino	2011-07-28	2	-5/+4
\|/ /
* \|	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	2	-8/+16
\|\ \ \
\| * \| \|	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	2	-6/+15
* \| \| \|	Merge pull request #2329 from nertzy/master	Xavier Noria	2011-07-28	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Give attribution to Peter Jaros for the patch we paired on.	Grant Hutchins	2011-07-28	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #2326 from castlerock/plugin_generator_fix	Santiago Pastorino	2011-07-28	1	-8/+8
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	pluging generator test fix	Vishnu Atrai	2011-07-28	1	-8/+8
\|/ / /