From 6f17d009947acdc28f0198d0ded7da1d99db065f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 27 Jul 2020 03:09:23 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 doc/ci/yaml/README.md                          |   6 +++++-
 .../img/heatmap_chart_too_much_data_v_13_2.png | Bin
 .../view_merge_request_diff_patch_spec.rb      |  17 ++++++++---------
 3 files changed, 13 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 doc/operations/metrics/dashboards/img/heatmap_chart_too_much_data_v_13_2.png

diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 831ced81a87..049a0f3f562 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -3438,7 +3438,11 @@ job split into three separate jobs.
 
 #### Parallel `matrix` jobs
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15356) in GitLab 13.2.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15356) in GitLab 13.3.
+> - It's deployed behind a feature flag, disabled by default.
+> - It's enabled on GitLab.com.
+> - It can't be enabled or disabled per-project.
+> - It's recommended for production use.
 
 `matrix:` allows you to configure different variables for jobs that are running in parallel.
 There can be from 2 to 50 jobs.
diff --git a/doc/operations/metrics/dashboards/img/heatmap_chart_too_much_data_v_13_2.png b/doc/operations/metrics/dashboards/img/heatmap_chart_too_much_data_v_13_2.png
old mode 100755
new mode 100644
diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb
index 3c2c068dfd1..15c41581e6b 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/view_merge_request_diff_patch_spec.rb
@@ -3,31 +3,30 @@
 module QA
   RSpec.describe 'Create' do
     describe 'Download merge request patch and diff' do
-      before(:context) do
-        @merge_request = Resource::MergeRequest.fabricate_via_api! do |merge_request|
+      let(:merge_request) do
+        Resource::MergeRequest.fabricate_via_api! do |merge_request|
           merge_request.title = 'This is a merge request'
           merge_request.description = '... for downloading patches and diffs'
         end
       end
 
-      it 'views the merge request email patches' do
+      before do
         Flow::Login.sign_in
+        merge_request.visit!
+      end
 
-        @merge_request.visit!
+      it 'views the merge request email patches' do
         Page::MergeRequest::Show.perform(&:view_email_patches)
 
         expect(page.text).to start_with('From')
         expect(page).to have_content('Subject: [PATCH] This is a test commit')
-        expect(page).to have_content("diff --git a/#{@merge_request.file_name} b/#{@merge_request.file_name}")
+        expect(page).to have_content("diff --git a/#{merge_request.file_name} b/#{merge_request.file_name}")
       end
 
       it 'views the merge request plain diff' do
-        Flow::Login.sign_in
-
-        @merge_request.visit!
         Page::MergeRequest::Show.perform(&:view_plain_diff)
 
-        expect(page.text).to start_with("diff --git a/#{@merge_request.file_name} b/#{@merge_request.file_name}")
+        expect(page.text).to start_with("diff --git a/#{merge_request.file_name} b/#{merge_request.file_name}")
         expect(page).to have_content('+File Added')
       end
     end
-- 
GitLab