diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-19 16:09:33 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-10-19 16:09:33 -0200 |
| commit | cbaf2190c15346f2304e79e26a6c05cfd51c236e (patch) | |
| tree | 63da770f4a38acc194ef2e9baed0c7f1cec3d64a /actionpack | |
| parent | 091da45fd714848c76c710d04e17d33a24ccf3fd (diff) | |
| parent | aefec3c61af90afaef73298fef64c64ad4611a65 (diff) | |
| download | rails-cbaf2190c15346f2304e79e26a6c05cfd51c236e.tar.gz rails-cbaf2190c15346f2304e79e26a6c05cfd51c236e.tar.bz2 rails-cbaf2190c15346f2304e79e26a6c05cfd51c236e.zip | |
Merge pull request #17323 from seuros/master
remove duplicate method (_status_code) in action_dispatch
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/rack_delegation.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb index 6921834044..545d4a7e6e 100644 --- a/actionpack/lib/action_controller/metal/rack_delegation.rb +++ b/actionpack/lib/action_controller/metal/rack_delegation.rb @@ -6,7 +6,7 @@ module ActionController extend ActiveSupport::Concern delegate :headers, :status=, :location=, :content_type=, - :status, :location, :content_type, :_status_code, :to => "@_response" + :status, :location, :content_type, :response_code, :to => "@_response" def dispatch(action, request) set_response!(request) diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index d0580058c3..99d46af953 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -309,9 +309,6 @@ module ActionDispatch # :nodoc: cookies end - def _status_code #:nodoc: - @status - end private def before_committed |