From a9c7eaea5d180ffd827cc9b34e173755af3df0c1 Mon Sep 17 00:00:00 2001
From: Marc Rendl Ignacio <marcrendlignacio@gmail.com>
Date: Fri, 21 Jul 2017 08:51:18 +0800
Subject: [PATCH 1/2] Updates Rails upgrade guide for 4.2 to 5.0 regarding the
 removal of `ActionView::Helpers::RecordTagHelper`

---
 guides/source/upgrading_ruby_on_rails.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 88a7d0a464..6e927d7244 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -276,6 +276,16 @@ You can now just call the dependency once with a wildcard.
 <% # Template Dependency: recordings/threads/events/* %>
 ```
 
+### `ActionView::Helpers::RecordTagHelper` moved to external gem (record_tag_helper)
+
+`content_tag_for` and `div_for` has been removed in favor of just using `content_tag`. To continue using it, add the `record_tag_helper` gem to your Gemfile:
+
+```ruby
+gem 'record_tag_helper', '~> 1.0'
+```
+
+See [#18411](https://github.com/rails/rails/pull/18411) for more details.
+
 ### Removed Support for `protected_attributes` Gem
 
 The `protected_attributes` gem is no longer supported in Rails 5.

From ec80bacf6f21801c73b5887cc4bfb943de83ada6 Mon Sep 17 00:00:00 2001
From: Marc Rendl Ignacio <marcrendlignacio@gmail.com>
Date: Fri, 21 Jul 2017 09:02:47 +0800
Subject: [PATCH 2/2] Suppress documentation for content_tag_for and div_for
 since they were removed already

---
 actionview/lib/action_view/helpers/record_tag_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/actionview/lib/action_view/helpers/record_tag_helper.rb b/actionview/lib/action_view/helpers/record_tag_helper.rb
index f7ee573035..ad59006386 100644
--- a/actionview/lib/action_view/helpers/record_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/record_tag_helper.rb
@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
     module RecordTagHelper
-      def div_for(*)
+      def div_for(*) # :nodoc:
         raise NoMethodError, "The `div_for` method has been removed from " \
           "Rails. To continue using it, add the `record_tag_helper` gem to " \
           "your Gemfile:\n" \
@@ -9,7 +9,7 @@ module ActionView
           "Consult the Rails upgrade guide for details."
       end
 
-      def content_tag_for(*)
+      def content_tag_for(*) # :nodoc:
         raise NoMethodError, "The `content_tag_for` method has been removed from " \
           "Rails. To continue using it, add the `record_tag_helper` gem to " \
           "your Gemfile:\n" \