Automatic merge of gitlab-org/gitlab-ce master

app/views/projects/diffs/_warning.html.haml

@@ -9,4 +9,4 @@
         = link_to _("Plain diff"), merge_request_path(@merge_request, format: :diff), class: "btn btn-sm"
         = link_to _("Email patch"), merge_request_path(@merge_request, format: :patch), class: "btn btn-sm"
   %p
-    = _("To preserve performance only <strong>%{display_size} of ${real_size}</strong> files are displayed.").html_safe % { display_size: diff_files.size, real_size: diff_files.real_size }
+    = _("To preserve performance only <strong>%{display_size} of %{real_size}</strong> files are displayed.").html_safe % { display_size: diff_files.size, real_size: diff_files.real_size }

changelogs/unreleased/sh-fix-real-size-warnings.yml

+---
+title: Fix broken templated "Too many changes to show" text
+merge_request: 24282
+author:
+type: fixed

doc/ci/runners/README.md

@@ -135,6 +135,14 @@ Consider that if you don't lock your specific Runner to a specific project, any
 user with Maintainer role in you project can assign your Runner to another arbitrary
 project without requiring your authorization, so use it with caution.
 
+CAUTION: **Caution:**
+Never add a private Runner that you're using in your private projects to a
+project that you share with other people.
+
+CAUTION: **Caution:**
+Never use a Runner from a project which has multiple maintainers in your
+private project.
+
 An admin can enable/disable a specific Runner for projects:
 
 1. Navigate to **Admin > Runners**

spec/features/projects/compare_spec.rb

@@ -87,6 +87,21 @@ describe "Compare", :js do
 
       expect(find(".js-compare-from-dropdown .dropdown-content")).to have_selector("li", count: 3)
     end
+
+    context 'when commit has overflow', :js do
+      it 'displays warning' do
+        visit project_compare_index_path(project, from: "feature", to: "master")
+
+        allow(Commit).to receive(:max_diff_options).and_return(max_files: 3)
+        allow_any_instance_of(DiffHelper).to receive(:render_overflow_warning?).and_return(true)
+
+        click_button('Compare')
+
+        page.within('.alert') do
+          expect(page).to have_text("Too many changes to show. To preserve performance only 3 of 3+ files are displayed.")
+        end
+      end
+    end
   end
 
   describe "tags" do