Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/scripts/create-pipeline-failure-incident.rb b/scripts/create-pipeline-failure-incident.rb
index bbabfb7dfce..92d8444c7cd 100755
--- a/scripts/create-pipeline-failure-incident.rb
+++ b/scripts/create-pipeline-failure-incident.rb
@@ -99,7 +99,7 @@ class CreatePipelineFailureIncident
       You can create a merge request, assign to any available maintainer, and ping people that were involved/related to the introduction of the failure.
       Additionally, a message can be posted in `#backend_maintainers` or `#frontend_maintainers` to get a maintainer take a look at the fix ASAP.
 
-    In both cases, make sure to add the ~"pipeline:expedite-master-fixing" label, and `master:broken` or `master:foss-broken` label, to speed up the `master`-fixing pipelines.
+    In both cases, make sure to add the ~"pipeline:expedite" label, and `master:broken` or `master:foss-broken` label, to speed up the `master`-fixing pipelines.
 
     ### Resolution
 
diff --git a/scripts/trigger-build.rb b/scripts/trigger-build.rb
index 8dfab8dd2eb..411e5ed13c6 100755
--- a/scripts/trigger-build.rb
+++ b/scripts/trigger-build.rb
@@ -153,7 +153,7 @@ module Trigger
 
     # Read version files from all components
     def version_file_variables
-      Dir.glob("*_VERSION").each_with_object({}) do |version_file, params|
+      Dir.glob("*_VERSION").each_with_object({}) do |version_file, params| # rubocop:disable Rails/IndexWith
         params[version_file] = version_param_value(version_file)
       end
     end