aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/head.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-10-10 02:10:20 -0300
committerGitHub <noreply@github.com>2016-10-10 02:10:20 -0300
commit0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3 (patch)
tree0d0363ee64c840cadf9e0e0d7e32de95633287ae /actionpack/lib/action_controller/metal/head.rb
parent034e4d38b508cbf2a8eaa9742df3e1948e482827 (diff)
parentde9542acd56f60d281465a59eac11e15ca8b3323 (diff)
downloadrails-0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3.tar.gz
rails-0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3.tar.bz2
rails-0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3.zip
Merge pull request #26746 from rails/deprecations
Remove all deprecations from Action Pack
Diffstat (limited to 'actionpack/lib/action_controller/metal/head.rb')
-rw-r--r--actionpack/lib/action_controller/metal/head.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb
index 86b5eb20d7..4dff23dd85 100644
--- a/actionpack/lib/action_controller/metal/head.rb
+++ b/actionpack/lib/action_controller/metal/head.rb
@@ -18,13 +18,7 @@ module ActionController
# See Rack::Utils::SYMBOL_TO_STATUS_CODE for a full list of valid +status+ symbols.
def head(status, options = {})
if status.is_a?(Hash)
- msg = status[:status] ? "The :status option" : "The implicit :ok status"
- options, status = status, status.delete(:status)
-
- ActiveSupport::Deprecation.warn(<<-MSG.squish)
- #{msg} on `head` has been deprecated and will be removed in Rails 5.1.
- Please pass the status as a separate parameter before the options, instead.
- MSG
+ raise ArgumentError, "#{status.inspect} is not a valid value for `status`."
end
status ||= :ok