2 files changed, 1 insertions, 29 deletions
diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index 6bb0875bc3..96c3eec337 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -7,25 +7,6 @@ module ActionView
   # = Active Model Helpers
   module Helpers
     module ActiveModelHelper
-      %w(input form error_messages_for error_message_on).each do |method|
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{method}(*args)
-            ActiveSupport::Deprecation.warn "#{method} was removed from Rails and is now available as a plugin. " <<
-              "Please install it with `rails plugin install git://github.com/rails/dynamic_form.git`.", caller
-          end
-        RUBY
-      end
-    end
-
-    module ActiveModelFormBuilder
-      %w(error_messages error_message_on).each do |method|
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def #{method}(*args)
-            ActiveSupport::Deprecation.warn "f.#{method} was removed from Rails and is now available as a plugin. " <<
-              "Please install it with `rails plugin install git://github.com/rails/dynamic_form.git`.", caller
-          end
-        RUBY
-      end
     end
 
     module ActiveModelInstanceTag
@@ -67,10 +48,6 @@ module ActionView
       end
     end
 
-    class FormBuilder
-      include ActiveModelFormBuilder
-    end
-
     class InstanceTag
       include ActiveModelInstanceTag
     end
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 555be6ed2b..f8147840ed 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -268,7 +268,7 @@ module ActionView
       # The +options+ hash accepts the same options as url_for.
       #
       # There are a few special +html_options+:
-      # * <tt>:method</tt> - Symbol of HTTP verb. Supported verbs are <tt>:post</tt>, <tt>:get</tt>, 
+      # * <tt>:method</tt> - Symbol of HTTP verb. Supported verbs are <tt>:post</tt>, <tt>:get</tt>,
       #   <tt>:delete</tt> and <tt>:put</tt>. By default it will be <tt>:post</tt>.
       # * <tt>:disabled</tt> - If set to true, it will generate a disabled button.
       # * <tt>:confirm</tt> - This will use the unobtrusive JavaScript driver to
@@ -594,11 +594,6 @@ module ActionView
           end
 
           confirm = html_options.delete("confirm")
-
-          if html_options.key?("popup")
-            ActiveSupport::Deprecation.warn(":popup has been deprecated", caller)
-          end
-
           method, href = html_options.delete("method"), html_options['href']
 
           add_confirm_to_attributes!(html_options, confirm) if confirm