3 files changed, 42 insertions, 8 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 55f2148640..f44f03f40d 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,12 +1,10 @@
-## Rails 6.0.0.alpha (Unreleased) ##
-
 *   Enable select tag helper to mark `prompt` option as `selected` and/or `disabled` for `required`
     field. Example:
 
-        select :post, 
-               :category, 
-               ["lifestyle", "programming", "spiritual"], 
-               { selected: "", disabled: "", prompt: "Choose one" }, 
+        select :post,
+               :category,
+               ["lifestyle", "programming", "spiritual"],
+               { selected: "", disabled: "", prompt: "Choose one" },
                { required: true }
 
     Placeholder option would be selected and disabled. The HTML produced:
@@ -19,7 +17,7 @@
 
     *Sergey Prikhodko*
 
-*   Don't enforce UTF-8 by default
+*   Don't enforce UTF-8 by default.
 
     With the disabling of TLS 1.0 by most major websites, continuing to run
     IE8 or lower becomes increasingly difficult so default to not enforcing
diff --git a/actionview/lib/action_view/helpers/form_tag_helper.rb b/actionview/lib/action_view/helpers/form_tag_helper.rb
index 5a8b8555a0..54f82e058e 100644
--- a/actionview/lib/action_view/helpers/form_tag_helper.rb
+++ b/actionview/lib/action_view/helpers/form_tag_helper.rb
@@ -551,7 +551,8 @@ module ActionView
       #   # => <input src="/assets/save.png" data-confirm="Are you sure?" type="image" />
       def image_submit_tag(source, options = {})
         options = options.stringify_keys
-        tag :input, { "type" => "image", "src" => path_to_image(source) }.update(options)
+        src = path_to_image(source, skip_pipeline: options.delete("skip_pipeline"))
+        tag :input, { "type" => "image", "src" => src }.update(options)
       end
 
       # Creates a field set for grouping HTML form elements.
diff --git a/actionview/test/activerecord/multifetch_cache_test.rb b/actionview/test/activerecord/multifetch_cache_test.rb
new file mode 100644
index 0000000000..12be069e69
--- /dev/null
+++ b/actionview/test/activerecord/multifetch_cache_test.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require "active_record_unit"
+require "active_record/railties/collection_cache_association_loading"
+
+ActionView::PartialRenderer.prepend(ActiveRecord::Railties::CollectionCacheAssociationLoading)
+
+class MultifetchCacheTest < ActiveRecordTestCase
+  fixtures :topics, :replies
+
+  def setup
+    view_paths = ActionController::Base.view_paths
+
+    @view = Class.new(ActionView::Base) do
+      def view_cache_dependencies
+        []
+      end
+
+      def combined_fragment_cache_key(key)
+        [ :views, key ]
+      end
+    end.new(view_paths, {})
+  end
+
+  def test_only_preloading_for_records_that_miss_the_cache
+    @view.render partial: "test/partial", collection: [topics(:rails)], cached: true
+
+    @topics = Topic.preload(:replies)
+
+    @view.render partial: "test/partial", collection: @topics, cached: true
+
+    assert_not @topics.detect { |topic| topic.id == topics(:rails).id }.replies.loaded?
+    assert     @topics.detect { |topic| topic.id != topics(:rails).id }.replies.loaded?
+  end
+end