From aefec3c61af90afaef73298fef64c64ad4611a65 Mon Sep 17 00:00:00 2001 From: Abdelkader Boudih Date: Sun, 19 Oct 2014 17:28:24 +0000 Subject: remove duplicate method (_status_code) in action_dispatch --- actionpack/lib/action_controller/metal/rack_delegation.rb | 2 +- actionpack/lib/action_dispatch/http/response.rb | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) (limited to 'actionpack') 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 -- cgit v1.2.3