diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-10-09 02:48:01 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-10-09 02:48:01 -0700 |
| commit | 29e704d98bec8783d45f58b639972973f18be016 (patch) | |
| tree | b04da83592b9b86e225a6a36e2bedcd6d7932cf3 /actionpack/lib | |
| parent | 09b3b76f77aa6c033566eb4abd011b41604aeacc (diff) | |
| parent | 8642c2aadc94b6763290711384c265289b02faaa (diff) | |
| download | rails-29e704d98bec8783d45f58b639972973f18be016.tar.gz rails-29e704d98bec8783d45f58b639972973f18be016.tar.bz2 rails-29e704d98bec8783d45f58b639972973f18be016.zip | |
Merge pull request #12083 from BlueHotDog/fixing_respond_with
Fixing repond_with working directly on the options hash
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb index 66dabd821f..a072fce1a1 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -326,6 +326,7 @@ module ActionController #:nodoc: if collector = retrieve_collector_from_mimes(&block) options = resources.size == 1 ? {} : resources.extract_options! + options = options.clone options[:default_response] = collector.response (options.delete(:responder) || self.class.responder).call(self, resources, options) end |