Add latest changes from gitlab-org/gitlab@master

4 files changed, 9 insertions, 9 deletions

diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index aab26f361a4..71871d1b1b7 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -755,7 +755,7 @@ the status of other builds:
 job:
   script: "echo Hello, Rules!"
   rules:
-    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH == "master"'
+    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
       when: always
     - if: '$VAR =~ /pattern/'
       when: manual
@@ -781,11 +781,11 @@ evaluated should be conjoined into a single expression using `&&` or `||`. For e
 job:
   script: "echo Hello, Rules!"
   rules:
-    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH =~ /^feature/ && $CI_MERGE_REQUEST_TARGET_BRANCH == "master"' # This rule will be evaluated
+    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/ && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' # This rule will be evaluated
       when: always
-    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH =~ /^feature/' # This rule will only be evaluated if the target branch is not "master"
+    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/' # This rule will only be evaluated if the target branch is not "master"
       when: manual
-    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH' # If neither of the first two match but the simple presence does, we set to "on_success" by default
+    - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME' # If neither of the first two match but the simple presence does, we set to "on_success" by default
 ```
 
 If none of the provided rules match, the job will be set to `when:never`, and
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md
index db832a4accf..be829d871d9 100644
--- a/doc/user/clusters/applications.md
+++ b/doc/user/clusters/applications.md
@@ -109,7 +109,7 @@ NOTE: **Note:**
 The [`runner/gitlab-runner`](https://gitlab.com/gitlab-org/charts/gitlab-runner)
 chart is used to install this application with a
 [`values.yaml`](https://gitlab.com/gitlab-org/gitlab/blob/master/vendor/runner/values.yaml)
-file.
+file. Customizing installation by modifying this file is not supported.
 
 ### Ingress
 
diff --git a/qa/qa/page/project/settings/main.rb b/qa/qa/page/project/settings/main.rb
index 3a60330217b..18d55598d90 100644
--- a/qa/qa/page/project/settings/main.rb
+++ b/qa/qa/page/project/settings/main.rb
@@ -58,5 +58,3 @@ module QA
     end
   end
 end
-
-QA::Page::Project::Settings::Main.prepend_if_ee('QA::EE::Page::Project::Settings::Main')
diff --git a/qa/qa/resource/repository/commit.rb b/qa/qa/resource/repository/commit.rb
index 4b4c64d589d..8ce5a137486 100644
--- a/qa/qa/resource/repository/commit.rb
+++ b/qa/qa/resource/repository/commit.rb
@@ -58,8 +58,10 @@ module QA
         end
 
         def actions
-          @add_files.map { |file| file.merge({ action: "create" }) } if @add_files
-          @update_files.map { |file| file.merge({ action: "update" }) } if @update_files
+          pending_actions = []
+          @add_files.map { |file| pending_actions << file.merge({ action: "create" }) } if @add_files
+          @update_files.map { |file| pending_actions << file.merge({ action: "update" }) } if @update_files
+          pending_actions
         end
 
         private