diff options
| author | Abdelkader Boudih <terminale@gmail.com> | 2014-10-19 17:28:24 +0000 |
|---|---|---|
| committer | Abdelkader Boudih <terminale@gmail.com> | 2014-10-19 17:59:07 +0000 |
| commit | aefec3c61af90afaef73298fef64c64ad4611a65 (patch) | |
| tree | cbe5226ff1cace8ac19778443745edd4902e6310 | |
| parent | 61af5cc95dd10e16d9261d88bf589f441dfe9d6a (diff) | |
| download | rails-aefec3c61af90afaef73298fef64c64ad4611a65.tar.gz rails-aefec3c61af90afaef73298fef64c64ad4611a65.tar.bz2 rails-aefec3c61af90afaef73298fef64c64ad4611a65.zip | |
remove duplicate method (_status_code) in action_dispatch
| -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 |