Add latest changes from gitlab-org/gitlab@master

19 files changed, 152 insertions, 80 deletions

diff --git a/.gitlab/issue_templates/Geo Replicate a new Git repository type.md b/.gitlab/issue_templates/Geo Replicate a new Git repository type.md
index 97f756f0d02..eee989ed21e 100644
--- a/.gitlab/issue_templates/Geo Replicate a new Git repository type.md
+++ b/.gitlab/issue_templates/Geo Replicate a new Git repository type.md
@@ -517,7 +517,6 @@ That's all of the required database changes.
 
   module Geo
     class CoolWidgetState < ApplicationRecord
-      include EachBatch
       include ::Geo::VerificationStateDefinition
 
       self.primary_key = :cool_widget_id
diff --git a/.gitlab/issue_templates/Geo Replicate a new blob type.md b/.gitlab/issue_templates/Geo Replicate a new blob type.md
index 9dfc83309cc..88a7fad4975 100644
--- a/.gitlab/issue_templates/Geo Replicate a new blob type.md
+++ b/.gitlab/issue_templates/Geo Replicate a new blob type.md
@@ -482,7 +482,6 @@ That's all of the required database changes.
 
   module Geo
     class CoolWidgetState < ApplicationRecord
-      include EachBatch
       include ::Geo::VerificationStateDefinition
 
       self.primary_key = :cool_widget_id
diff --git a/.gitlab/merge_request_templates/Quarantine End to End Test.md b/.gitlab/merge_request_templates/Quarantine End to End Test.md
index 5f26f3ac74d..731b51b169b 100644
--- a/.gitlab/merge_request_templates/Quarantine End to End Test.md
+++ b/.gitlab/merge_request_templates/Quarantine End to End Test.md
@@ -29,7 +29,7 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new
 - [ ] To ensure a faster turnaround, ask in the `#quality_maintainers` Slack channel for someone to review and merge the merge request, rather than assigning it directly.
 
 <!-- Base labels. -->
-/label ~"Quality" ~"QA" ~"type::maintenance"
+/label ~"Quality" ~"QA" ~"type::maintenance" ~"maintenance::pipelines"
 
 <!--
 Choose the stage that appears in the test path, e.g. ~"devops::create" for
diff --git a/app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue b/app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue
index 08245aed240..8837b7a1917 100644
--- a/app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue
+++ b/app/assets/javascripts/ci/pipeline_new/components/pipeline_new_form.vue
@@ -35,7 +35,10 @@ let pollTimeout;
 export const POLLING_INTERVAL = 2000;
 const i18n = {
   variablesDescription: s__(
-    'Pipeline|Specify variable values to be used in this run. The values specified in %{linkStart}CI/CD settings%{linkEnd} will be used by default.',
+    'Pipeline|Specify variable values to be used in this run. The variables specified in the configuration file as well as %{linkStart}CI/CD settings%{linkEnd} are used by default.',
+  ),
+  overrideNoteText: s__(
+    'CiVariables|Variables specified here are %{boldStart}expanded%{boldEnd} and not %{boldStart}masked.%{boldEnd}',
   ),
   defaultError: __('Something went wrong on our end. Please try again.'),
   refsLoadingErrorTitle: s__('Pipeline|Branches or tags could not be loaded.'),
@@ -408,7 +411,7 @@ export default {
 
     <gl-loading-icon v-if="isLoading" class="gl-mb-5" size="lg" />
 
-    <gl-form-group v-else :label="s__('Pipeline|Variables')">
+    <gl-form-group v-else class="gl-mb-3" :label="s__('Pipeline|Variables')">
       <div
         v-for="(variable, index) in variables"
         :key="variable.uniqueId"
@@ -503,6 +506,15 @@ export default {
         </gl-sprintf></template
       >
     </gl-form-group>
+    <div class="gl-mb-4 gl-text-gray-500">
+      <gl-sprintf :message="$options.i18n.overrideNoteText">
+        <template #bold="{ content }">
+          <strong>
+            {{ content }}
+          </strong>
+        </template>
+      </gl-sprintf>
+    </div>
     <div class="gl-pt-5 gl-display-flex">
       <gl-button
         type="submit"
diff --git a/app/assets/javascripts/jobs/components/job/manual_variables_form.vue b/app/assets/javascripts/jobs/components/job/manual_variables_form.vue
index d079e91a4d0..763eb6705aa 100644
--- a/app/assets/javascripts/jobs/components/job/manual_variables_form.vue
+++ b/app/assets/javascripts/jobs/components/job/manual_variables_form.vue
@@ -77,13 +77,16 @@ export default {
   i18n: {
     clearInputs: s__('CiVariables|Clear inputs'),
     formHelpText: s__(
-      'CiVariables|Specify variable values to be used in this run. The values specified in %{linkStart}CI/CD settings%{linkEnd} will be used as default',
+      'CiVariables|Specify variable values to be used in this run. The variables specified in the configuration file and %{linkStart}CI/CD settings%{linkEnd} are used by default.',
+    ),
+    overrideNoteText: s__(
+      'CiVariables|Variables specified here are %{boldStart}expanded%{boldEnd} and not %{boldStart}masked.%{boldEnd}',
     ),
     header: s__('CiVariables|Variables'),
     keyLabel: s__('CiVariables|Key'),
     keyPlaceholder: s__('CiVariables|Input variable key'),
     runAgainButtonText: s__('CiVariables|Run job again'),
-    triggerButtonText: s__('CiVariables|Trigger this manual action'),
+    triggerButtonText: s__('CiVariables|Run job'),
     valueLabel: s__('CiVariables|Value'),
     valuePlaceholder: s__('CiVariables|Input variable value'),
   },
@@ -259,6 +262,15 @@ export default {
           </template>
         </gl-sprintf>
       </div>
+      <div class="gl-text-center gl-mt-3">
+        <gl-sprintf :message="$options.i18n.overrideNoteText">
+          <template #bold="{ content }">
+            <strong>
+              {{ content }}
+            </strong>
+          </template>
+        </gl-sprintf>
+      </div>
       <div v-if="isRetryable" class="gl-display-flex gl-justify-content-center gl-mt-5">
         <gl-button
           class="gl-mt-5"
diff --git a/app/assets/stylesheets/page_bundles/merge_requests.scss b/app/assets/stylesheets/page_bundles/merge_requests.scss
index 5c699dd81df..fe64e4f2fe8 100644
--- a/app/assets/stylesheets/page_bundles/merge_requests.scss
+++ b/app/assets/stylesheets/page_bundles/merge_requests.scss
@@ -812,7 +812,8 @@ $tabs-holder-z-index: 250;
 
 .mr-widget-body-ready-merge {
   @include media-breakpoint-down(sm) {
-    @include gl-p-3;
+    @include gl-py-3;
+    @include gl-pr-3;
   }
 }
 
diff --git a/doc/ci/jobs/index.md b/doc/ci/jobs/index.md
index fb9c795657d..5e69ecff7b8 100644
--- a/doc/ci/jobs/index.md
+++ b/doc/ci/jobs/index.md
@@ -272,9 +272,11 @@ the pipeline view, *not* the play (**{play}**) button.
 
 Define CI/CD variables here when you want to alter the execution of a job that uses
 [CI/CD variables](../variables/index.md).
-Add a variable name (key) and value to [override the value](../variables/index.md#override-a-defined-cicd-variable)
-defined in the UI or `.gitlab-ci.yml`
-for a single run of the manual job.
+
+If you add a variable that is already defined in the CI/CD settings or `.gitlab-ci.yml` file,
+the [variable is overridden](../variables/index.md#override-a-defined-cicd-variable) with the new value.
+Any variables overridden by using this process are [expanded](../variables/index.md#prevent-cicd-variable-expansion)
+and not [masked](../variables/index.md#mask-a-cicd-variable).
 
 ![Manual job variables](img/manual_job_variables_v13_10.png)
 
diff --git a/doc/ci/pipelines/index.md b/doc/ci/pipelines/index.md
index 683f6adcaab..fa04cb6cb92 100644
--- a/doc/ci/pipelines/index.md
+++ b/doc/ci/pipelines/index.md
@@ -166,7 +166,9 @@ In manually-triggered pipelines, the **Run pipeline** page displays all pipeline
 that have a `description` defined in the `.gitlab-ci.yml` file. The description displays
 below the variable.
 
-You can change the prefilled value, which overrides the value for that single pipeline run.
+You can change the prefilled value, which [overrides the value](../variables/index.md#override-a-defined-cicd-variable) for that single pipeline run.
+Any variables overridden by using this process are [expanded](../variables/index.md#prevent-cicd-variable-expansion)
+and not [masked](../variables/index.md#mask-a-cicd-variable).
 If you do not define a `value` for the variable in the configuration file, the variable name is still listed,
 but the value field is blank.
 
diff --git a/lib/gitlab/ci/status/build/play.rb b/lib/gitlab/ci/status/build/play.rb
index c66b8ca5654..55e510166b4 100644
--- a/lib/gitlab/ci/status/build/play.rb
+++ b/lib/gitlab/ci/status/build/play.rb
@@ -22,7 +22,7 @@ module Gitlab
           end
 
           def action_button_title
-            _('Trigger this manual action')
+            _('Run job')
           end
 
           def action_path
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 5eb4c0b0157..13ae7fc419e 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8849,13 +8849,16 @@ msgstr ""
 msgid "CiVariables|Remove variable row"
 msgstr ""
 
+msgid "CiVariables|Run job"
+msgstr ""
+
 msgid "CiVariables|Run job again"
 msgstr ""
 
 msgid "CiVariables|Scope"
 msgstr ""
 
-msgid "CiVariables|Specify variable values to be used in this run. The values specified in %{linkStart}CI/CD settings%{linkEnd} will be used as default"
+msgid "CiVariables|Specify variable values to be used in this run. The variables specified in the configuration file and %{linkStart}CI/CD settings%{linkEnd} are used by default."
 msgstr ""
 
 msgid "CiVariables|State"
@@ -8864,9 +8867,6 @@ msgstr ""
 msgid "CiVariables|This %{entity} has %{currentVariableCount} defined CI/CD variables. The maximum number of variables per %{entity} is %{maxVariableLimit}. To add new variables, you must reduce the number of defined variables."
 msgstr ""
 
-msgid "CiVariables|Trigger this manual action"
-msgstr ""
-
 msgid "CiVariables|Type"
 msgstr ""
 
@@ -8876,6 +8876,9 @@ msgstr ""
 msgid "CiVariables|Variables"
 msgstr ""
 
+msgid "CiVariables|Variables specified here are %{boldStart}expanded%{boldEnd} and not %{boldStart}masked.%{boldEnd}"
+msgstr ""
+
 msgid "CiVariables|Variables store information, like passwords and secret keys, that you can use in job scripts. Each %{entity} can define a maximum of %{limit} variables."
 msgstr ""
 
@@ -31544,6 +31547,9 @@ msgstr ""
 msgid "Pipeline|Specify variable values to be used in this run. The values specified in %{linkStart}CI/CD settings%{linkEnd} will be used by default."
 msgstr ""
 
+msgid "Pipeline|Specify variable values to be used in this run. The variables specified in the configuration file as well as %{linkStart}CI/CD settings%{linkEnd} are used by default."
+msgstr ""
+
 msgid "Pipeline|Stages"
 msgstr ""
 
@@ -36584,6 +36590,9 @@ msgstr ""
 msgid "Run housekeeping tasks to automatically optimize Git repositories. Disabling this option will cause performance to degenerate over time."
 msgstr ""
 
+msgid "Run job"
+msgstr ""
+
 msgid "Run manual job again"
 msgstr ""
 
@@ -45044,9 +45053,6 @@ msgstr ""
 msgid "Trigger repository check"
 msgstr ""
 
-msgid "Trigger this manual action"
-msgstr ""
-
 msgid "Trigger token:"
 msgstr ""
 
diff --git a/qa/Gemfile b/qa/Gemfile
index ca0955b4320..b04653a657c 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -24,7 +24,7 @@ gem 'rspec-parameterized', '~> 1.0.0'
 gem 'octokit', '~> 6.0.1'
 gem "faraday-retry", "~> 2.0"
 gem 'webdrivers', '~> 5.2'
-gem 'zeitwerk', '~> 2.6', '>= 2.6.6'
+gem 'zeitwerk', '~> 2.6', '>= 2.6.7'
 gem 'influxdb-client', '~> 2.9'
 gem 'terminal-table', '~> 3.0.2', require: false
 gem 'slack-notifier', '~> 2.4', require: false
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 5a8cd6cf3d3..9feb930d7c9 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -298,7 +298,7 @@ GEM
     websocket (1.2.9)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.6)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby
@@ -339,7 +339,7 @@ DEPENDENCIES
   terminal-table (~> 3.0.2)
   warning (~> 1.3)
   webdrivers (~> 5.2)
-  zeitwerk (~> 2.6, >= 2.6.6)
+  zeitwerk (~> 2.6, >= 2.6.7)
 
 BUNDLED WITH
    2.4.6
diff --git a/qa/qa/specs/features/api/1_manage/import/import_github_repo_spec.rb b/qa/qa/specs/features/api/1_manage/import/import_github_repo_spec.rb
index a10e95a860c..9017aba8e4a 100644
--- a/qa/qa/specs/features/api/1_manage/import/import_github_repo_spec.rb
+++ b/qa/qa/specs/features/api/1_manage/import/import_github_repo_spec.rb
@@ -3,7 +3,10 @@
 module QA
   # https://github.com/gitlab-qa-github/import-test <- project under test
   #
-  RSpec.describe 'Manage', product_group: :import do
+  RSpec.describe 'Manage', product_group: :import, quarantine: {
+    issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/391228',
+    type: :waiting_on
+  } do
     describe 'GitHub import' do
       include_context 'with github import'
 
diff --git a/qa/qa/specs/features/browser_ui/1_manage/import/import_github_repo_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/import/import_github_repo_spec.rb
index 43a8af93e27..c07bc8ac65b 100644
--- a/qa/qa/specs/features/browser_ui/1_manage/import/import_github_repo_spec.rb
+++ b/qa/qa/specs/features/browser_ui/1_manage/import/import_github_repo_spec.rb
@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 module QA
-  RSpec.describe 'Manage', product_group: :import do
+  RSpec.describe 'Manage', product_group: :import, quarantine: {
+    issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/391230',
+    type: :waiting_on
+  } do
     describe 'GitHub import' do
       include_context 'with github import'
 
diff --git a/spec/features/dashboard/datetime_on_tooltips_spec.rb b/spec/features/dashboard/datetime_on_tooltips_spec.rb
index 880f9ec2b72..c6e78c8b57c 100644
--- a/spec/features/dashboard/datetime_on_tooltips_spec.rb
+++ b/spec/features/dashboard/datetime_on_tooltips_spec.rb
@@ -44,7 +44,7 @@ RSpec.describe 'Tooltips on .timeago dates', :js, feature_category: :user_profil
       wait_for_requests
     end
 
-    it 'has the datetime formated correctly' do
+    it 'has the datetime formated correctly', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/334481' do
       expect(page).to have_selector('[data-testid=snippet-created-at] .js-timeago', text: '1 day ago')
 
       page.find('[data-testid=snippet-created-at] .js-timeago').hover
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 40562d22a41..67389fdda8a 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -745,11 +745,11 @@ RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state, feature_category: :proj
             'You can add CI/CD variables below for last-minute configuration changes before starting the job.'
           )
         )
-        expect(page).to have_button('Trigger this manual action')
+        expect(page).to have_button('Run job')
       end
 
       it 'plays manual action and shows pending status', :js do
-        click_button 'Trigger this manual action'
+        click_button 'Run job'
 
         wait_for_requests
         expect(page).to have_content('This job has not started yet')
@@ -783,7 +783,7 @@ RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state, feature_category: :proj
             'You can add CI/CD variables below for last-minute configuration changes before starting the job.'
           )
         )
-        expect(page).to have_button('Trigger this manual action')
+        expect(page).to have_button('Run job')
       end
     end
 
diff --git a/spec/frontend/environments/graphql/mock_data.js b/spec/frontend/environments/graphql/mock_data.js
index 0b1c8dc6fb8..5ea0be41614 100644
--- a/spec/frontend/environments/graphql/mock_data.js
+++ b/spec/frontend/environments/graphql/mock_data.js
@@ -166,7 +166,7 @@ export const environmentsApp = {
                 title: 'Play',
                 path: '/h5bp/html5-boilerplate/-/jobs/911/play',
                 method: 'post',
-                button_title: 'Trigger this manual action',
+                button_title: 'Run job',
               },
             },
           },
@@ -374,7 +374,7 @@ export const resolvedEnvironmentsApp = {
                 title: 'Play',
                 path: '/h5bp/html5-boilerplate/-/jobs/911/play',
                 method: 'post',
-                buttonTitle: 'Trigger this manual action',
+                buttonTitle: 'Run job',
               },
             },
           },
@@ -675,7 +675,7 @@ export const resolvedEnvironment = {
             title: 'Play',
             path: '/h5bp/html5-boilerplate/-/jobs/1015/play',
             method: 'post',
-            buttonTitle: 'Trigger this manual action',
+            buttonTitle: 'Run job',
           },
         },
       },
diff --git a/spec/frontend/pipelines/linked_pipelines_mock.json b/spec/frontend/pipelines/linked_pipelines_mock.json
index 8ad19ef4865..a68283032d2 100644
--- a/spec/frontend/pipelines/linked_pipelines_mock.json
+++ b/spec/frontend/pipelines/linked_pipelines_mock.json
@@ -7,7 +7,7 @@
     "state": "active",
     "avatar_url": "https://assets.gitlab-static.net/uploads/-/system/user/avatar/3585/avatar.png",
     "web_url": "https://gitlab.com/axil",
-    "status_tooltip_html": "\u003cspan class=\"user-status-emoji has-tooltip\" title=\"I like pizza\" data-html=\"true\" data-placement=\"top\"\u003e\u003cgl-emoji title=\"slice of pizza\" data-name=\"pizza\" data-unicode-version=\"6.0\"\u003e🍕\u003c/gl-emoji\u003e\u003c/span\u003e",
+    "status_tooltip_html": "<span class=\"user-status-emoji has-tooltip\" title=\"I like pizza\" data-html=\"true\" data-placement=\"top\"><gl-emoji title=\"slice of pizza\" data-name=\"pizza\" data-unicode-version=\"6.0\">🍕</gl-emoji></span>",
     "path": "/axil"
   },
   "active": false,
@@ -68,7 +68,7 @@
                 "title": "Play",
                 "path": "/gitlab-org/gitlab-runner/-/jobs/72469032/play",
                 "method": "post",
-                "button_title": "Trigger this manual action"
+                "button_title": "Run job"
               }
             },
             "jobs": [
@@ -104,7 +104,7 @@
                     "title": "Play",
                     "path": "/gitlab-org/gitlab-runner/-/jobs/72469032/play",
                     "method": "post",
-                    "button_title": "Trigger this manual action"
+                    "button_title": "Run job"
                   }
                 }
               }
@@ -290,7 +290,9 @@
         "dropdown_path": "/gitlab-org/gitlab-runner/pipelines/23211253/stage.json?stage=cleanup"
       }
     ],
-    "artifacts": [],
+    "artifacts": [
+
+    ],
     "manual_actions": [
       {
         "name": "review-docs-cleanup",
@@ -305,7 +307,9 @@
         "scheduled": false
       }
     ],
-    "scheduled_actions": []
+    "scheduled_actions": [
+
+    ]
   },
   "ref": {
     "name": "docs/add-development-guide-to-readme",
@@ -319,7 +323,9 @@
     "short_id": "8083eb0a",
     "title": "Add link to development guide in readme",
     "created_at": "2018-06-05T11:30:48.000Z",
-    "parent_ids": ["1d7cf79b5a1a2121b9474ac20d61c1b8f621289d"],
+    "parent_ids": [
+      "1d7cf79b5a1a2121b9474ac20d61c1b8f621289d"
+    ],
     "message": "Add link to development guide in readme\n\nCloses https://gitlab.com/gitlab-org/gitlab-runner/issues/3122\n",
     "author_name": "Achilleas Pipinellis",
     "author_email": "axil@gitlab.com",
@@ -337,7 +343,7 @@
       "status_tooltip_html": null,
       "path": "/axil"
     },
-    "author_gravatar_url": "https://secure.gravatar.com/avatar/1d37af00eec153a8333a4ce18e9aea41?s=80\u0026d=identicon",
+    "author_gravatar_url": "https://secure.gravatar.com/avatar/1d37af00eec153a8333a4ce18e9aea41?s=80&d=identicon",
     "commit_url": "https://gitlab.com/gitlab-org/gitlab-runner/commit/8083eb0a920572214d0dccedd7981f05d535ad46",
     "commit_path": "/gitlab-org/gitlab-runner/commit/8083eb0a920572214d0dccedd7981f05d535ad46"
   },
@@ -402,7 +408,7 @@
                   "title": "Play",
                   "path": "/gitlab-com/gitlab-docs/-/jobs/114982853/play",
                   "method": "post",
-                  "button_title": "Trigger this manual action"
+                  "button_title": "Run job"
                 }
               },
               "jobs": [
@@ -437,7 +443,7 @@
                       "title": "Play",
                       "path": "/gitlab-com/gitlab-docs/-/jobs/114982853/play",
                       "method": "post",
-                      "button_title": "Trigger this manual action"
+                      "button_title": "Run job"
                     }
                   }
                 }
@@ -466,7 +472,7 @@
                   "title": "Play",
                   "path": "/gitlab-com/gitlab-docs/-/jobs/114982854/play",
                   "method": "post",
-                  "button_title": "Trigger this manual action"
+                  "button_title": "Run job"
                 }
               },
               "jobs": [
@@ -501,7 +507,7 @@
                       "title": "Play",
                       "path": "/gitlab-com/gitlab-docs/-/jobs/114982854/play",
                       "method": "post",
-                      "button_title": "Trigger this manual action"
+                      "button_title": "Run job"
                     }
                   }
                 }
@@ -530,7 +536,7 @@
                   "title": "Play",
                   "path": "/gitlab-com/gitlab-docs/-/jobs/114982855/play",
                   "method": "post",
-                  "button_title": "Trigger this manual action"
+                  "button_title": "Run job"
                 }
               },
               "jobs": [
@@ -565,7 +571,7 @@
                       "title": "Play",
                       "path": "/gitlab-com/gitlab-docs/-/jobs/114982855/play",
                       "method": "post",
-                      "button_title": "Trigger this manual action"
+                      "button_title": "Run job"
                     }
                   }
                 }
@@ -782,7 +788,9 @@
           "dropdown_path": "/gitlab-com/gitlab-docs/pipelines/34993051/stage.json?stage=deploy"
         }
       ],
-      "artifacts": [],
+      "artifacts": [
+
+      ],
       "manual_actions": [
         {
           "name": "image:bootstrap",
@@ -809,7 +817,9 @@
           "scheduled": false
         }
       ],
-      "scheduled_actions": []
+      "scheduled_actions": [
+
+      ]
     },
     "project": {
       "id": 1794617,
@@ -875,7 +885,7 @@
                     "title": "Play",
                     "path": "/gitlab-com/gitlab-docs/-/jobs/114982853/play",
                     "method": "post",
-                    "button_title": "Trigger this manual action"
+                    "button_title": "Run job"
                   }
                 },
                 "jobs": [
@@ -910,7 +920,7 @@
                         "title": "Play",
                         "path": "/gitlab-com/gitlab-docs/-/jobs/114982853/play",
                         "method": "post",
-                        "button_title": "Trigger this manual action"
+                        "button_title": "Run job"
                       }
                     }
                   }
@@ -939,7 +949,7 @@
                     "title": "Play",
                     "path": "/gitlab-com/gitlab-docs/-/jobs/114982854/play",
                     "method": "post",
-                    "button_title": "Trigger this manual action"
+                    "button_title": "Run job"
                   }
                 },
                 "jobs": [
@@ -974,7 +984,7 @@
                         "title": "Play",
                         "path": "/gitlab-com/gitlab-docs/-/jobs/114982854/play",
                         "method": "post",
-                        "button_title": "Trigger this manual action"
+                        "button_title": "Run job"
                       }
                     }
                   }
@@ -1003,7 +1013,7 @@
                     "title": "Play",
                     "path": "/gitlab-com/gitlab-docs/-/jobs/114982855/play",
                     "method": "post",
-                    "button_title": "Trigger this manual action"
+                    "button_title": "Run job"
                   }
                 },
                 "jobs": [
@@ -1038,7 +1048,7 @@
                         "title": "Play",
                         "path": "/gitlab-com/gitlab-docs/-/jobs/114982855/play",
                         "method": "post",
-                        "button_title": "Trigger this manual action"
+                        "button_title": "Run job"
                       }
                     }
                   }
@@ -1255,7 +1265,9 @@
             "dropdown_path": "/gitlab-com/gitlab-docs/pipelines/34993051/stage.json?stage=deploy"
           }
         ],
-        "artifacts": [],
+        "artifacts": [
+
+        ],
         "manual_actions": [
           {
             "name": "image:bootstrap",
@@ -1282,7 +1294,9 @@
             "scheduled": false
           }
         ],
-        "scheduled_actions": []
+        "scheduled_actions": [
+
+        ]
       },
       "project": {
         "id": 1794617,
@@ -1291,7 +1305,9 @@
         "full_name": "GitLab.com / GitLab Docs"
       }
     },
-    "triggered": []
+    "triggered": [
+
+    ]
   },
   "triggered": [
     {
@@ -1352,7 +1368,7 @@
                     "title": "Play",
                     "path": "/gitlab-com/gitlab-docs/-/jobs/114982853/play",
                     "method": "post",
-                    "button_title": "Trigger this manual action"
+                    "button_title": "Run job"
                   }
                 },
                 "jobs": [
@@ -1387,7 +1403,7 @@
                         "title": "Play",
                         "path": "/gitlab-com/gitlab-docs/-/jobs/114982853/play",
                         "method": "post",
-                        "button_title": "Trigger this manual action"
+                        "button_title": "Run job"
                       }
                     }
                   }
@@ -1416,7 +1432,7 @@
                     "title": "Play",
                     "path": "/gitlab-com/gitlab-docs/-/jobs/114982854/play",
                     "method": "post",
-                    "button_title": "Trigger this manual action"
+                    "button_title": "Run job"
                   }
                 },
                 "jobs": [
@@ -1451,7 +1467,7 @@
                         "title": "Play",
                         "path": "/gitlab-com/gitlab-docs/-/jobs/114982854/play",
                         "method": "post",
-                        "button_title": "Trigger this manual action"
+                        "button_title": "Run job"
                       }
                     }
                   }
@@ -1480,7 +1496,7 @@
                     "title": "Play",
                     "path": "/gitlab-com/gitlab-docs/-/jobs/114982855/play",
                     "method": "post",
-                    "button_title": "Trigger this manual action"
+                    "button_title": "Run job"
                   }
                 },
                 "jobs": [
@@ -1515,7 +1531,7 @@
                         "title": "Play",
                         "path": "/gitlab-com/gitlab-docs/-/jobs/114982855/play",
                         "method": "post",
-                        "button_title": "Trigger this manual action"
+                        "button_title": "Run job"
                       }
                     }
                   }
@@ -1732,7 +1748,9 @@
             "dropdown_path": "/gitlab-com/gitlab-docs/pipelines/34993051/stage.json?stage=deploy"
           }
         ],
-        "artifacts": [],
+        "artifacts": [
+
+        ],
         "manual_actions": [
           {
             "name": "image:bootstrap",
@@ -1759,7 +1777,9 @@
             "scheduled": false
           }
         ],
-        "scheduled_actions": []
+        "scheduled_actions": [
+
+        ]
       },
       "project": {
         "id": 1794617,
@@ -1767,7 +1787,10 @@
         "full_path": "/gitlab-com/gitlab-docs",
         "full_name": "GitLab.com / GitLab Docs"
       },
-      "triggered": [{}]
+      "triggered": [
+        {
+        }
+      ]
     },
     {
       "id": 34993052,
@@ -1827,7 +1850,7 @@
                     "title": "Play",
                     "path": "/gitlab-com/gitlab-docs/-/jobs/114982853/play",
                     "method": "post",
-                    "button_title": "Trigger this manual action"
+                    "button_title": "Run job"
                   }
                 },
                 "jobs": [
@@ -1862,7 +1885,7 @@
                         "title": "Play",
                         "path": "/gitlab-com/gitlab-docs/-/jobs/114982853/play",
                         "method": "post",
-                        "button_title": "Trigger this manual action"
+                        "button_title": "Run job"
                       }
                     }
                   }
@@ -1891,7 +1914,7 @@
                     "title": "Play",
                     "path": "/gitlab-com/gitlab-docs/-/jobs/114982854/play",
                     "method": "post",
-                    "button_title": "Trigger this manual action"
+                    "button_title": "Run job"
                   }
                 },
                 "jobs": [
@@ -1926,7 +1949,7 @@
                         "title": "Play",
                         "path": "/gitlab-com/gitlab-docs/-/jobs/114982854/play",
                         "method": "post",
-                        "button_title": "Trigger this manual action"
+                        "button_title": "Run job"
                       }
                     }
                   }
@@ -1955,7 +1978,7 @@
                     "title": "Play",
                     "path": "/gitlab-com/gitlab-docs/-/jobs/114982855/play",
                     "method": "post",
-                    "button_title": "Trigger this manual action"
+                    "button_title": "Run job"
                   }
                 },
                 "jobs": [
@@ -1990,7 +2013,7 @@
                         "title": "Play",
                         "path": "/gitlab-com/gitlab-docs/-/jobs/114982855/play",
                         "method": "post",
-                        "button_title": "Trigger this manual action"
+                        "button_title": "Run job"
                       }
                     }
                   }
@@ -2207,7 +2230,9 @@
             "dropdown_path": "/gitlab-com/gitlab-docs/pipelines/34993051/stage.json?stage=deploy"
           }
         ],
-        "artifacts": [],
+        "artifacts": [
+
+        ],
         "manual_actions": [
           {
             "name": "image:bootstrap",
@@ -2234,7 +2259,9 @@
             "scheduled": false
           }
         ],
-        "scheduled_actions": []
+        "scheduled_actions": [
+
+        ]
       },
       "project": {
         "id": 1794617,
@@ -3373,7 +3400,7 @@
                         "title": "Play",
                         "path": "/h5bp/html5-boilerplate/-/jobs/545/play",
                         "method": "post",
-                        "button_title": "Trigger this manual action"
+                        "button_title": "Run job"
                       }
                     },
                     "jobs": [
@@ -3409,7 +3436,7 @@
                             "title": "Play",
                             "path": "/h5bp/html5-boilerplate/-/jobs/545/play",
                             "method": "post",
-                            "button_title": "Trigger this manual action"
+                            "button_title": "Run job"
                           }
                         }
                       }
@@ -3467,7 +3494,9 @@
                 "scheduled": false
               }
             ],
-            "scheduled_actions": []
+            "scheduled_actions": [
+
+            ]
           },
           "ref": {
             "name": "master",
@@ -3481,7 +3510,9 @@
             "short_id": "bad98c45",
             "title": "remove instances of shrink-to-fit=no (#2103)",
             "created_at": "2018-12-17T20:52:18.000Z",
-            "parent_ids": ["49130f6cfe9ff1f749015d735649a2bc6f66cf3a"],
+            "parent_ids": [
+              "49130f6cfe9ff1f749015d735649a2bc6f66cf3a"
+            ],
             "message": "remove instances of shrink-to-fit=no (#2103)\n\ncloses #2102\r\n\r\nPer my findings, the need for it as a default was rectified with the release of iOS 9.3, where the viewport no longer shrunk to accommodate overflow, as was introduced in iOS 9.",
             "author_name": "Scott O'Hara",
             "author_email": "scottaohara@users.noreply.github.com",
@@ -3490,7 +3521,7 @@
             "committer_email": "rob@drunkenfist.com",
             "committed_date": "2018-12-17T20:52:18.000Z",
             "author": null,
-            "author_gravatar_url": "https://www.gravatar.com/avatar/6d597df7cf998d16cbe00ccac063b31e?s=80\u0026d=identicon",
+            "author_gravatar_url": "https://www.gravatar.com/avatar/6d597df7cf998d16cbe00ccac063b31e?s=80&d=identicon",
             "commit_url": "http://localhost:3001/h5bp/html5-boilerplate/commit/bad98c453eab56d20057f3929989251d45cd1a8b",
             "commit_path": "/h5bp/html5-boilerplate/commit/bad98c453eab56d20057f3929989251d45cd1a8b"
           },
@@ -3522,7 +3553,9 @@
               "full_name": "Gitlab Org / Gitlab Test"
             }
           },
-          "triggered": [],
+          "triggered": [
+
+          ],
           "project": {
             "id": 1794617,
             "name": "GitLab Docs",
diff --git a/spec/lib/gitlab/ci/status/build/play_spec.rb b/spec/lib/gitlab/ci/status/build/play_spec.rb
index ade07a54877..2c93f842a30 100644
--- a/spec/lib/gitlab/ci/status/build/play_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/play_spec.rb
@@ -75,7 +75,7 @@ RSpec.describe Gitlab::Ci::Status::Build::Play do
   end
 
   describe '#action_button_title' do
-    it { expect(subject.action_button_title).to eq 'Trigger this manual action' }
+    it { expect(subject.action_button_title).to eq 'Run job' }
   end
 
   describe '.matches?' do