3 files changed, 5 insertions, 52 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 2e5088cfbe..6c4ce6195e 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Remove `respond_to`/`respond_with` placeholder methods, this functionality
+    has been extracted to the `responders` gem.
+
+    *Carlos Antonio da Silva*
+
 *   Remove deprecated assertion files.
 
     *Rafael Mendonça França*
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index ac1f209232..a2a5f67b1e 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -3,26 +3,6 @@ require 'abstract_controller/collector'
 
 module ActionController #:nodoc:
   module MimeResponds
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def respond_to(*)
-        raise NoMethodError, "The controller-level `respond_to' feature has " \
-          "been extracted to the `responders` gem. Add it to your Gemfile to " \
-          "continue using this feature:\n" \
-          "  gem 'responders', '~> 2.0'\n" \
-          "Consult the Rails upgrade guide for details."
-      end
-    end
-
-    def respond_with(*)
-      raise NoMethodError, "The `respond_with' feature has been extracted " \
-        "to the `responders` gem. Add it to your Gemfile to continue using " \
-        "this feature:\n" \
-        "  gem 'responders', '~> 2.0'\n" \
-        "Consult the Rails upgrade guide for details."
-    end
-
     # Without web-service support, an action which collects the data for displaying a list of people
     # might look something like this:
     #
diff --git a/actionpack/test/controller/mime/responders_test.rb b/actionpack/test/controller/mime/responders_test.rb
deleted file mode 100644
index 032b4c0ab1..0000000000
--- a/actionpack/test/controller/mime/responders_test.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'abstract_unit'
-require 'controller/fake_models'
-
-class ResponderTest < ActionController::TestCase
-  def test_class_level_respond_to
-    e = assert_raises(NoMethodError) do
-      Class.new(ActionController::Base) do
-        respond_to :json
-      end
-    end
-
-    assert_includes e.message, '`responders` gem'
-    assert_includes e.message, '~> 2.0'
-  end
-
-  def test_respond_with
-    klass = Class.new(ActionController::Base) do
-      def index
-        respond_with Customer.new("david", 13)
-      end
-    end
-
-    @controller = klass.new
-
-    e = assert_raises(NoMethodError) do
-      get :index
-    end
-
-    assert_includes e.message, '`responders` gem'
-    assert_includes e.message, '~> 2.0'
-  end
-end