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

	Commit message (Collapse)	Author	Age	Files	Lines
*	remove extra require for 'stringio' as it is required in helper.rb	Vishnu Atrai	2011-07-31	1	-1/+0
\|
*	Merge pull request #2358 from arunagw/test_fix_187_skip	José Valim	2011-07-31	1	-3/+4
\|\ \| \| \| \|	skiping magic comment test for < 1.9
\| *	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.
\| * \|	Covering more files in test for plugin new generator.	Vishnu Atrai	2011-07-29	1	-0/+2
\| \| \|
* \| \|	Merge pull request #2364 from ↵	José Valim	2011-07-30	1	-0/+1
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	bcardarella/resolve_undefined_instance_attributes_instance_variable Resolve warnings by instantizing @attrubtes as nil
\| * \|	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
\| * \|	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 not return frozen objects
\| * \|	Change ActiveSupport::Cache behavior to always return duplicate objects ↵	Brian Durand	2011-07-29	2	-22/+18
\| \| \| \| \| \| \| \| \| \| \| \|	instead of frozen objects.
* \| \|	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. ↵	Aaron Patterson	2011-07-29	2	-3/+16
\| \| \| \| \| \| \| \| \| \| \| \|	fixes #1592
* \| \|	Merge pull request #2342 from ↵	Santiago Pastorino	2011-07-29	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bcardarella/remove_controller_instance_variable_warnings_from_sprocket_helper_test Resolve "instance variable @controller not initialized" warnings for sprocket_helper_test
\| * \| \|	Instead of removing the instance variable just set it to nil, resolves the ↵	Brian Cardarella	2011-07-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	warnings because of a missing instance variable
* \| \| \|	Merge pull request #2344 from ↵	Aaron Patterson	2011-07-29	2	-0/+12
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	bcardarella/resolve_warning_for_capture_helper_test Reset @dirty to false when slicing an instance of SafeBuffer
\| * \| \|	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
\| * \|	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
\|\ \ \| \| \| \| \| \|	Ensure that app/mailers gets created in new plugins (#2287 brought into master)
\| * \|	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.
\| *	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
\|\ \ \| \| \| \| \| \|	Inline resources router fix
\| * \|	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
\| \| \| \| \| \| \| \| \| \| \| \|	This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.
* \| \|	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
\| * \| \|	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
\| * \|	pluging generator test fix	Vishnu Atrai	2011-07-28	1	-8/+8
\|/ /
* \|	Tidy up a bit plugin new gemspec	Santiago Pastorino	2011-07-28	1	-7/+3
\| \|
* \|	Merge pull request #2295 from dgeb/mo-better-plugins	Santiago Pastorino	2011-07-28	4	-13/+42
\|\ \ \| \| \| \| \| \|	Improve dependency management and gemspec file for plugins
\| * \|	Moved dependencies from Gemfile to gemspec to eliminate redundant declarations.	Dan Gebhardt	2011-07-28	2	-7/+24
\| \| \|
\| * \|	Extracted version from gemspec and placed it in its own file. This is ↵	Dan Gebhardt	2011-07-28	3	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \|	consistent with the approach taken by "bundle gem", and is expected by gems such as svenfuchs/gem-release which can be used to bump / tag versions of gems.
\| * \|	Expanded meta-data in gemspec to include author, email, etc.; Defaults ↵	Dan Gebhardt	2011-07-28	1	-4/+8
\| \| \| \| \| \| \| \| \| \| \| \|	include "TODO" to prevent gems from being built without review.
* \| \|	Revert "Merge pull request #2309 from smasry/master"	Jon Leighton	2011-07-28	2	-6/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 9d396ee8195e31f646e0b89158ed96f4db4ab38f, reversing changes made to fa2bfd832c1d1e997d93c2269a485cc74782c86d. Reason: the change broke the build.
* \| \|	Update CHANGELOG.	José Valim	2011-07-28	1	-0/+2
\| \| \|
* \| \|	Move the cache to a nested hash which performs better than a hash with array ↵	José Valim	2011-07-28	1	-11/+17
\| \| \| \| \| \| \| \| \| \| \| \|	as keys.
* \| \|	Rename class method to_path to _to_path and make it explicit that it is an ↵	José Valim	2011-07-28	2	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \|	internal method.
* \| \|	Merge pull request #2034 from Casecommons/to_path	José Valim	2011-07-28	10	-33/+131
\|\ \ \ \| \| \| \| \| \| \| \|	Allow ActiveModel-compatible instances to define their own partial paths
\| * \| \|	Let ActiveModel instances define partial paths.	Grant Hutchins & Peter Jaros	2011-07-25	10	-33/+131
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deprecate ActiveModel::Name#partial_path. Now you should call #to_path directly on ActiveModel instances.
* \| \| \|	Make Rails.application.assets available in initializers	Joshua Peek	2011-07-27	1	-44/+36
\| \| \| \|
* \| \| \|	contrib app minor tweak	Xavier Noria	2011-07-27	1	-2/+2
\| \| \| \|
* \| \| \|	Merge pull request #2309 from smasry/master	Aaron Patterson	2011-07-27	2	-1/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Unmangaling reverse_sql_order when function is used
\| * \| \| \|	Reverse order fix when using function for ActiveRecord::QueryMethods Fixes #1697	Samer Masry	2011-07-27	2	-1/+6
\|/ / / /
* \| \| \|	Merge pull request #2305 from thedarkone/errors-include	Santiago Pastorino	2011-07-27	2	-1/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Improve AM::Errors#include?
\| * \| \| \|	Handle the empty array correctly.	thedarkone	2011-07-27	2	-1/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Improve performance and memory usage for options_for_select with Ruby 1.8.7	Christos Zisopoulos	2011-07-27	1	-2/+2
\| \| \| \|