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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Allow deep merging of hash values for nested with_options. [#490 state:resolved]	Lawrence Pit	2008-07-17	1	-0/+27
\| \| \| \|	Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
*	require abstract_unit directly since test is in load path	Jeremy Kemper	2008-01-05	1	-1/+1
\| \| \| \|	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8563 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Don't undefine #class in OptionMerger [Rick]	Rick Olson	2006-09-27	1	-0/+5
\| \| \| \|	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5197 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	r4487@asus: jeremy \| 2006-04-29 12:21:39 -0700	Jeremy Kemper	2006-07-08	1	-12/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check whether @flash is defined? for warnings-safety. r4488@asus: jeremy \| 2006-04-29 12:23:15 -0700 Check whether @flash is defined? for warnings-safety. Obviates nil? check. r4489@asus: jeremy \| 2006-04-29 12:45:18 -0700 Check whether @session is defined? for warnings-safety. r4490@asus: jeremy \| 2006-04-29 12:50:41 -0700 Check whether @rendering_runtime is defined? for warnings-safety. r4491@asus: jeremy \| 2006-04-29 12:55:01 -0700 Check whether @_cycles is defined? for warnings-safety. r4492@asus: jeremy \| 2006-04-29 12:59:19 -0700 Check whether instance variables are defined? for warnings-safety. r4493@asus: jeremy \| 2006-04-29 13:14:09 -0700 Add nil @template to PrototypeHelperTest to suppress unitialized instance variable warning. r4494@asus: jeremy \| 2006-04-29 13:31:34 -0700 Check whether @auto_index defined? for warnings-safety. r4495@asus: jeremy \| 2006-04-29 13:32:24 -0700 Wrap content_columns redefinitions with silence_warnings. r4496@asus: jeremy \| 2006-04-29 13:35:28 -0700 Wrap more redefinitions with silence_warnings. r4829@asus: jeremy \| 2006-07-08 10:59:20 -0700 abstract unit, fix warnings r4830@asus: jeremy \| 2006-07-08 11:06:12 -0700 Use parens to silence warning. r4831@asus: jeremy \| 2006-07-08 11:06:48 -0700 Use parens to silence warning. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4595 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Allow default options in with_options to be overridden. Closes #4480. ↵	Marcel Molina	2006-04-26	1	-0/+16
\| \| \| \| \| \|	[murphy@cYcnus.de] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4282 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Added reusable reloading support through the inclusion of the Relodable ↵	David Heinemeier Hansson	2006-01-29	1	-1/+1
\| \| \| \| \| \|	module that all subclasses of ActiveRecord::Base, ActiveRecord::Observer, ActiveController::Base, and ActionMailer::Base automatically gets [DHH]. Added auto-loading support for classes in modules, so Conductor::Migration will look for conductor/migration.rb and Conductor::Database::Settings will look for conductor/database/settings.rb [Nicholas Seckar]. Refactored extensions to module, class, and object in active support [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3493 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Fix the requires in option_merger_test to unbreak AS tests	Sam Stephenson	2006-01-21	1	-2/+4
\| \| \| \|	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3458 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Add Object#with_options for DRYing up multiple calls to methods having ↵	Sam Stephenson	2005-12-15	1	-0/+32
	shared options git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3314 5ecf4fe2-1ee6-0310-87b1-e25e094e27de