aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/option_merger.rb
Commit message (Collapse)AuthorAgeFilesLines
* Added lambda merging to OptionMerger (especially useful with named_scope and ↵David Heinemeier Hansson2008-11-151-1/+7
| | | | with_options) [#740 state:committed] (Paweł Kondzior)
* Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, ↵Jeremy Kemper2008-08-311-1/+1
| | | | | | | | | | but it has since been removed from 1.9. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> Conflicts: actionpack/test/controller/layout_test.rb
* Allow deep merging of hash values for nested with_options. [#490 state:resolved]Lawrence Pit2008-07-171-9/+1
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* send -> send! for some private methodsJeremy Kemper2007-09-271-6/+6
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7659 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Some 1.9 forward compatibilityJeremy Kemper2007-09-141-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7474 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Don't undefine #class in OptionMerger [Rick]Rick Olson2006-09-271-1/+1
| | | | git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5197 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Allow default options in with_options to be overridden. Closes #4480. ↵Marcel Molina2006-04-261-2/+2
| | | | | | [murphy@cYcnus.de] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4282 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
* Add Object#with_options for DRYing up multiple calls to methods having ↵Sam Stephenson2005-12-151-0/+25
shared options git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3314 5ecf4fe2-1ee6-0310-87b1-e25e094e27de