aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2017-01-03 20:50:55 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2017-01-03 20:54:34 -0500
commit313082244e5167a6468d44cca92fec34674957b6 (patch)
tree85e3f575dde00a2dbc84d8a8d456bf1cc967609a
parent73395476021f88ca4289a061dfc266596d536a6e (diff)
downloadrails-313082244e5167a6468d44cca92fec34674957b6.tar.gz
rails-313082244e5167a6468d44cca92fec34674957b6.tar.bz2
rails-313082244e5167a6468d44cca92fec34674957b6.zip
Remove deprecated Metal#env
-rw-r--r--actionpack/CHANGELOG.md4
-rw-r--r--actionpack/lib/action_controller/metal.rb5
2 files changed, 4 insertions, 5 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index a5f6426f21..7183643002 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Remove deprecated `Metal#env`.
+
+ *Rafael Mendonça França*
+
* Make `with_routing` test helper work when testing controllers inheriting from `ActionController::API`
*Julia López*
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb
index 9dab7aeef4..b31a39b071 100644
--- a/actionpack/lib/action_controller/metal.rb
+++ b/actionpack/lib/action_controller/metal.rb
@@ -118,11 +118,6 @@ module ActionController
class Metal < AbstractController::Base
abstract!
- def env
- @_request.env
- end
- deprecate :env
-
# Returns the last part of the controller's name, underscored, without the ending
# <tt>Controller</tt>. For instance, PostsController returns <tt>posts</tt>.
# Namespaces are left out, so Admin::PostsController returns <tt>posts</tt> as well.