diff options
author | José Valim <jose.valim@gmail.com> | 2009-12-25 12:09:13 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-12-25 12:09:13 +0100 |
commit | eb8e627c6918dae53c7ab8b9208e72ff64d20348 (patch) | |
tree | 4f153960d158c119ebdcef7a3a02c407e4b82dd0 /actionpack/lib/action_dispatch/http/response.rb | |
parent | 4b8330d2d50ae4de14dd43ffbea4d91804553140 (diff) | |
parent | 1c66f85eb6cd80053cf60889634a8c39c21b11a1 (diff) | |
download | rails-eb8e627c6918dae53c7ab8b9208e72ff64d20348.tar.gz rails-eb8e627c6918dae53c7ab8b9208e72ff64d20348.tar.bz2 rails-eb8e627c6918dae53c7ab8b9208e72ff64d20348.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/http/response.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index 6dc563264f..8524bbd993 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -60,7 +60,7 @@ module ActionDispatch # :nodoc: end def status=(status) - @status = ActionDispatch::StatusCodes[status] + @status = Rack::Utils.status_code(status) end # The response code of the request @@ -74,7 +74,7 @@ module ActionDispatch # :nodoc: end def message - StatusCodes::STATUS_CODES[@status] + Rack::Utils::HTTP_STATUS_CODES[@status] end alias_method :status_message, :message |