From 0e5ce539275e32cfd7592362e03673807fca9cc7 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 15 Jun 2023 18:09:29 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .gitlab/ci/setup.gitlab-ci.yml                |   3 +
 .../pages/admin/jobs/components/constants.js  |  12 +-
 .../components/pipeline_details_header.vue    |   5 +-
 .../search/sort/components/app.vue            |  58 ++--
 .../stylesheets/page_bundles/login.scss       |   9 +-
 app/assets/stylesheets/pages/note_form.scss   |   2 +-
 app/helpers/ci/runners_helper.rb              |   7 +-
 app/models/ci/job_artifact.rb                 |   4 +-
 app/views/projects/diffs/_file.html.haml      |   7 +-
 doc/api/integrations.md                       |  11 +
 doc/development/code_review.md                |   2 +-
 .../documentation/restful_api_styleguide.md   |  18 +-
 doc/development/rake_tasks.md                 |   2 +-
 lib/api/admin/dictionary.rb                   |  61 ++++
 lib/api/api.rb                                |   1 +
 lib/api/entities/dictionary/table.rb          |  12 +
 lib/api/helpers/integrations_helpers.rb       |  12 +-
 locale/gitlab.pot                             |   8 +-
 scripts/api/create_merge_request_note.rb      |  22 ++
 .../generate-message-to-run-e2e-pipeline.rb   | 106 +++++++
 spec/frontend/fixtures/pipeline_header.rb     |  26 ++
 spec/frontend/pipelines/mock_data.js          |   8 +-
 .../pipelines/pipeline_details_header_spec.js |  14 +
 .../search/sort/components/app_spec.js        |  23 +-
 .../lib/atlassian/jira_connect/client_spec.rb |   7 +-
 .../serializers/deployment_entity_spec.rb     |   2 +-
 .../project_error_tracking_setting_spec.rb    |   2 +-
 spec/requests/api/admin/dictionary_spec.rb    |  59 ++++
 spec/requests/api/integrations_spec.rb        |   1 -
 .../api/create_merge_request_note_spec.rb     |  37 +++
 ...nerate_message_to_run_e2e_pipeline_spec.rb | 279 ++++++++++++++++++
 31 files changed, 742 insertions(+), 78 deletions(-)
 create mode 100644 lib/api/admin/dictionary.rb
 create mode 100644 lib/api/entities/dictionary/table.rb
 create mode 100644 scripts/api/create_merge_request_note.rb
 create mode 100755 scripts/generate-message-to-run-e2e-pipeline.rb
 create mode 100644 spec/requests/api/admin/dictionary_spec.rb
 create mode 100644 spec/scripts/api/create_merge_request_note_spec.rb
 create mode 100644 spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb

diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml
index 85409d37fa4..0323c2dcb91 100644
--- a/.gitlab/ci/setup.gitlab-ci.yml
+++ b/.gitlab/ci/setup.gitlab-ci.yml
@@ -167,6 +167,9 @@ e2e-test-pipeline-generate:
   script:
     - bundle exec rake "ci:detect_changes[$ENV_FILE]"
     - cd $CI_PROJECT_DIR && scripts/generate-e2e-pipeline
+    - source scripts/utils.sh
+    - install_gitlab_gem
+    - scripts/generate-message-to-run-e2e-pipeline.rb
   artifacts:
     expire_in: 1 day
     paths:
diff --git a/app/assets/javascripts/pages/admin/jobs/components/constants.js b/app/assets/javascripts/pages/admin/jobs/components/constants.js
index 8c4ea2cde92..4af8cb355fc 100644
--- a/app/assets/javascripts/pages/admin/jobs/components/constants.js
+++ b/app/assets/javascripts/pages/admin/jobs/components/constants.js
@@ -1,5 +1,5 @@
 import { s__, __ } from '~/locale';
-import { DEFAULT_FIELDS, RAW_TEXT_WARNING } from '~/jobs/components/table/constants';
+import { RAW_TEXT_WARNING } from '~/jobs/components/table/constants';
 
 export const JOBS_COUNT_ERROR_MESSAGE = __('There was an error fetching the number of jobs.');
 export const JOBS_FETCH_ERROR_MSG = __('There was an error fetching the jobs.');
@@ -19,11 +19,17 @@ export const RUNNER_EMPTY_TEXT = __('None');
 export const RUNNER_NO_DESCRIPTION = s__('Runners|No description');
 
 /* Admin Table constants */
+/* The field list is based on app/assets/javascripts/jobs/components/table/constants.js */
 export const DEFAULT_FIELDS_ADMIN = [
-  ...DEFAULT_FIELDS.slice(0, 2),
+  { key: 'status', label: __('Status'), columnClass: 'gl-w-15p' },
+  { key: 'job', label: __('Job'), columnClass: 'gl-w-20p' },
   { key: 'project', label: __('Project'), columnClass: 'gl-w-20p' },
   { key: 'runner', label: __('Runner'), columnClass: 'gl-w-15p' },
-  ...DEFAULT_FIELDS.slice(2),
+  { key: 'pipeline', label: __('Pipeline'), columnClass: 'gl-w-10p' },
+  { key: 'stage', label: __('Stage'), columnClass: 'gl-w-10p' },
+  { key: 'name', label: __('Name'), columnClass: 'gl-w-15p' },
+  { key: 'duration', label: __('Duration'), columnClass: 'gl-w-15p' },
+  { key: 'actions', label: '', columnClass: 'gl-w-10p' },
 ];
 
 export const RAW_TEXT_WARNING_ADMIN = RAW_TEXT_WARNING;
diff --git a/app/assets/javascripts/pipelines/components/pipeline_details_header.vue b/app/assets/javascripts/pipelines/components/pipeline_details_header.vue
index d4cdae5d69c..8fe6707028a 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_details_header.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_details_header.vue
@@ -280,6 +280,9 @@ export default {
     duration() {
       return this.pipeline?.duration || 0;
     },
+    showDuration() {
+      return this.duration && this.isFinished;
+    },
     durationFormatted() {
       return timeIntervalInWords(this.duration);
     },
@@ -560,7 +563,7 @@ export default {
             <gl-icon name="timer" />
             {{ inProgressText }}
           </span>
-          <span v-if="duration" class="gl-ml-2" data-testid="pipeline-duration-text">
+          <span v-if="showDuration" class="gl-ml-2" data-testid="pipeline-duration-text">
             <gl-icon name="timer" />
             {{ durationText }}
           </span>
diff --git a/app/assets/javascripts/search/sort/components/app.vue b/app/assets/javascripts/search/sort/components/app.vue
index 2bf144705c4..9f28d2bfc99 100644
--- a/app/assets/javascripts/search/sort/components/app.vue
+++ b/app/assets/javascripts/search/sort/components/app.vue
@@ -1,21 +1,14 @@
 <script>
-import {
-  GlButtonGroup,
-  GlButton,
-  GlDropdown,
-  GlDropdownItem,
-  GlTooltipDirective,
-} from '@gitlab/ui';
+import { GlCollapsibleListbox, GlButtonGroup, GlButton, GlTooltipDirective } from '@gitlab/ui';
 import { mapState, mapActions } from 'vuex';
 import { SORT_DIRECTION_UI } from '../constants';
 
 export default {
   name: 'GlobalSearchSort',
   components: {
+    GlCollapsibleListbox,
     GlButtonGroup,
     GlButton,
-    GlDropdown,
-    GlDropdownItem,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -26,8 +19,19 @@ export default {
       required: true,
     },
   },
+  data() {
+    return {
+      selectedSortOptionTitle: '',
+    };
+  },
   computed: {
     ...mapState(['query']),
+    listboxOptions() {
+      return this.searchSortOptions.map((option) => ({
+        text: option.title,
+        value: option.title,
+      }));
+    },
     selectedSortOption: {
       get() {
         const { sort } = this.query;
@@ -60,14 +64,23 @@ export default {
       return this.query?.sort?.includes('asc') ? SORT_DIRECTION_UI.asc : SORT_DIRECTION_UI.desc;
     },
   },
+  watch: {
+    selectedSortOption: {
+      handler() {
+        this.selectedSortOptionTitle = this.selectedSortOption.title;
+      },
+      immediate: true,
+    },
+  },
   methods: {
     ...mapActions(['applyQuery', 'setQuery']),
-    handleSortChange(option) {
-      if (!option.sortable) {
-        this.selectedSortOption = option.sortParam;
+    handleSortChange(value) {
+      const selectedOption = this.searchSortOptions.find((option) => option.title === value);
+      if (!selectedOption.sortable) {
+        this.selectedSortOption = selectedOption.sortParam;
       } else {
         // Default new sort options to desc
-        this.selectedSortOption = option.sortParam.desc;
+        this.selectedSortOption = selectedOption.sortParam.desc;
       }
     },
     handleSortDirectionChange() {
@@ -82,16 +95,15 @@ export default {
 
 <template>
   <gl-button-group>
-    <gl-dropdown :text="selectedSortOption.title" :right="true" class="w-100">
-      <gl-dropdown-item
-        v-for="sortOption in searchSortOptions"
-        :key="sortOption.title"
-        is-check-item
-        :is-checked="sortOption.title === selectedSortOption.title"
-        @click="handleSortChange(sortOption)"
-        >{{ sortOption.title }}</gl-dropdown-item
-      >
-    </gl-dropdown>
+    <gl-collapsible-listbox
+      v-model="selectedSortOptionTitle"
+      placement="right"
+      class="gl-z-index-1"
+      toggle-class="gl-rounded-top-right-none! gl-rounded-bottom-right-none!"
+      :toggle-text="selectedSortOptionTitle"
+      :items="listboxOptions"
+      @select="handleSortChange"
+    />
     <gl-button
       v-gl-tooltip
       :disabled="!selectedSortOption.sortable"
diff --git a/app/assets/stylesheets/page_bundles/login.scss b/app/assets/stylesheets/page_bundles/login.scss
index 1752d6e90a9..355d2afc0ba 100644
--- a/app/assets/stylesheets/page_bundles/login.scss
+++ b/app/assets/stylesheets/page_bundles/login.scss
@@ -196,13 +196,6 @@
     }
   }
 
-  .form-control {
-    &:active,
-    &:focus {
-      background-color: $white;
-    }
-  }
-
   .submit-container {
     margin-top: 16px;
   }
@@ -271,7 +264,7 @@
       left: 0;
       right: 0;
       height: 40px;
-      background: $white;
+      background: var(--white, $white);
     }
 
     .login-page-broadcast {
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index ecdbc171bdc..322363d7f4b 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -246,7 +246,7 @@ table {
 .commit-diff {
   .discussion-reply-holder {
     background-color: $gray-light;
-    border-radius: 0 0 3px 3px;
+    border-radius: 0 0 $gl-border-radius-base $gl-border-radius-base;
     padding: $gl-padding;
     border-top: 1px solid $gray-50;
 
diff --git a/app/helpers/ci/runners_helper.rb b/app/helpers/ci/runners_helper.rb
index 7177ddd3f31..b1481f668bb 100644
--- a/app/helpers/ci/runners_helper.rb
+++ b/app/helpers/ci/runners_helper.rb
@@ -22,12 +22,13 @@ module Ci
         icon = 'warning-solid'
       when :offline
         title = s_("Runners|Runner is offline; last contact was %{runner_contact} ago") % { runner_contact: time_ago_in_words(contacted_at) }
-        icon = 'status-failed'
-        span_class = 'gl-text-red-500'
+        icon = 'status-waiting'
+        span_class = 'gl-text-gray-500'
       when :stale
         # runner may have contacted (or not) and be stale: consider both cases.
         title = contacted_at ? s_("Runners|Runner is stale; last contact was %{runner_contact} ago") % { runner_contact: time_ago_in_words(contacted_at) } : s_("Runners|Runner is stale; it has never contacted this instance")
-        icon = 'warning-solid'
+        icon = 'time-out'
+        span_class = 'gl-text-orange-500'
       end
 
       content_tag(:span, class: span_class, title: title, data: { toggle: 'tooltip', container: 'body', testid: 'runner_status_icon', qa_selector: "runner_status_#{status}_content" }) do
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb
index 766155c6a99..5cd7988837e 100644
--- a/app/models/ci/job_artifact.rb
+++ b/app/models/ci/job_artifact.rb
@@ -372,11 +372,11 @@ module Ci
       file_stored_after_transaction_hooks
     end
 
-    # method overriden in EE
+    # method overridden in EE
     def file_stored_after_transaction_hooks
     end
 
-    # method overriden in EE
+    # method overridden in EE
     def file_stored_in_transaction_hooks
     end
 
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml
index 64bd1bf32f0..5ec95c3095d 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -17,9 +17,10 @@
       .file-actions.gl-display-none.gl-sm-display-flex
         #js-diff-stats{ data: diff_file_stats_data(diff_file) }
         - if diff_file.blob&.readable_text?
-          %span.has-tooltip{ title: _("Toggle comments for this file") }
-            = link_to '#', class: 'js-toggle-diff-comments btn gl-button btn-default btn-icon selected', disabled: @diff_notes_disabled do
-              = sprite_icon('comment')
+          - unless @diff_notes_disabled
+            %span.has-tooltip{ title: _("Toggle comments for this file") }
+              = link_to '#', class: 'js-toggle-diff-comments btn gl-button btn-default btn-icon selected' do
+                = sprite_icon('comment')
           \
           - if editable_diff?(diff_file)
             - link_opts = @merge_request.persisted? ? { from_merge_request_iid: @merge_request.iid } : {}
diff --git a/doc/api/integrations.md b/doc/api/integrations.md
index 7e7a514acf4..85549933c92 100644
--- a/doc/api/integrations.md
+++ b/doc/api/integrations.md
@@ -644,6 +644,17 @@ Parameters:
 | Parameter | Type | Required | Description |
 | --------- | ---- | -------- | ----------- |
 | `webhook` | string | true | Discord webhook. For example, `https://discord.com/api/webhooks/…` |
+| `branches_to_be_notified` | string | false | Branches to send notifications for. Valid options are `all`, `default`, `protected`, and `default_and_protected`. The default value is "default" |
+| `confidential_issues_events` | boolean | false | Enable notifications for confidential issue events |
+| `confidential_note_events` | boolean | false | Enable notifications for confidential note events |
+| `issues_events` | boolean | false | Enable notifications for issue events |
+| `merge_requests_events` | boolean | false | Enable notifications for merge request events |
+| `note_events` | boolean | false | Enable notifications for note events |
+| `notify_only_broken_pipelines` | boolean | false | Send notifications for broken pipelines |
+| `pipeline_events` | boolean | false | Enable notifications for pipeline events |
+| `push_events` | boolean | false | Enable notifications for push events |
+| `tag_push_events` | boolean | false | Enable notifications for tag push events |
+| `wiki_page_events` | boolean | false | Enable notifications for wiki page events |
 
 ### Disable Discord integration
 
diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index 2091af0d9ae..e9f00b640d9 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -764,7 +764,7 @@ A merge request may benefit from being considered a customer critical priority b
 
 Properties of customer critical merge requests:
 
-- The [VP of Development](https://about.gitlab.com/job-families/engineering/development/management/vp/) ([@clefelhocz1](https://gitlab.com/clefelhocz1)) is the DRI for deciding if a merge request qualifies as customer critical.
+- The [VP of Development](https://about.gitlab.com/job-families/engineering/development/management/vp/) ([@clefelhocz1](https://gitlab.com/clefelhocz1)) is the approver for deciding if a merge request qualifies as customer critical. Also, if two of his direct reports approve, that can also serve as approval.
 - The DRI applies the `customer-critical-merge-request` label to the merge request.
 - It is required that the reviewers and maintainers involved with a customer critical merge request are engaged as soon as this decision is made.
 - It is required to prioritize work for those involved on a customer critical merge request so that they have the time available necessary to focus on it.
diff --git a/doc/development/documentation/restful_api_styleguide.md b/doc/development/documentation/restful_api_styleguide.md
index 4964b66afd1..c39c7c02108 100644
--- a/doc/development/documentation/restful_api_styleguide.md
+++ b/doc/development/documentation/restful_api_styleguide.md
@@ -81,7 +81,7 @@ Example request:
 
 ```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" \
-  "https://gitlab.example.com/api/v4/endpoint?parameters"
+  --url "https://gitlab.example.com/api/v4/endpoint?parameters"
 ```
 
 Example response:
@@ -204,7 +204,7 @@ For information about writing attribute descriptions, see the [GraphQL API descr
   include it.
 - Use long option names (`--header` instead of `-H`) for legibility. (Tested in
   [`scripts/lint-doc.sh`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/scripts/lint-doc.sh).)
-- Wrap the URL in double quotes (`"`).
+- Declare URLs with the `--url` parameter, and wrap the URL in double quotes (`"`).
 - Prefer to use examples using the personal access token and don't pass data of
   username and password.
 - For legibility, use the <code>&#92;</code> character and indentation to break long single-line
@@ -233,7 +233,7 @@ Get the details of a group:
 
 ```shell
 curl --header "PRIVATE-TOKEN: <your_access_token>" \
-  "https://gitlab.example.com/api/v4/groups/gitlab-org"
+  --url "https://gitlab.example.com/api/v4/groups/gitlab-org"
 ```
 
 ### cURL example with parameters passed in the URL
@@ -242,7 +242,7 @@ Create a new project under the authenticated user's namespace:
 
 ```shell
 curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" \
-  "https://gitlab.example.com/api/v4/projects?name=foo"
+  --url "https://gitlab.example.com/api/v4/projects?name=foo"
 ```
 
 ### Post data using cURL's `--data`
@@ -254,7 +254,7 @@ can use cURL's `--data` option. The example below will create a new project
 ```shell
 curl --data "name=foo" \
   --header "PRIVATE-TOKEN: <your_access_token>" \
-  "https://gitlab.example.com/api/v4/projects"
+  --url "https://gitlab.example.com/api/v4/projects"
 ```
 
 ### Post data using JSON content
@@ -267,7 +267,7 @@ curl --request POST \
   --header "PRIVATE-TOKEN: <your_access_token>" \
   --header "Content-Type: application/json" \
   --data '{"path": "my-group", "name": "My group"}' \
-  "https://gitlab.example.com/api/v4/groups"
+  --url "https://gitlab.example.com/api/v4/groups"
 ```
 
 For readability, you can also set up the `--data` by using the following format:
@@ -293,7 +293,7 @@ curl --request POST \
   --header "PRIVATE-TOKEN: <your_access_token>" \
   --form "title=ssh-key" \
   --form "key=ssh-rsa AAAAB3NzaC1yc2EA..." \
-  "https://gitlab.example.com/api/v4/users/25/keys"
+  --url "https://gitlab.example.com/api/v4/users/25/keys"
 ```
 
 The above example is run by and administrator and will add an SSH public key
@@ -309,7 +309,7 @@ ASCII code.
 ```shell
 curl --request POST \
   --header "PRIVATE-TOKEN: <your_access_token>" \
-  "https://gitlab.example.com/api/v4/projects/42/issues?title=Hello%20GitLab"
+  --url "https://gitlab.example.com/api/v4/projects/42/issues?title=Hello%20GitLab"
 ```
 
 Use `%2F` for slashes (`/`).
@@ -325,5 +325,5 @@ curl --request PUT \
   --header "PRIVATE-TOKEN: <your_access_token>"
   --data "skip_users[]=<user_id>" \
   --data "skip_users[]=<user_id>" \
-  "https://gitlab.example.com/api/v4/projects/<project_id>/users"
+  --url "https://gitlab.example.com/api/v4/projects/<project_id>/users"
 ```
diff --git a/doc/development/rake_tasks.md b/doc/development/rake_tasks.md
index 8261330223d..0305cbf25b4 100644
--- a/doc/development/rake_tasks.md
+++ b/doc/development/rake_tasks.md
@@ -310,7 +310,7 @@ One way to generate the initial list is to run the Rake task `rubocop:todo:gener
 bundle exec rake rubocop:todo:generate
 ```
 
-To generate TODO list for specific RuboCop rules, pass them comma-seperated as
+To generate TODO list for specific RuboCop rules, pass them comma-separated as
 argument to the Rake task:
 
 ```shell
diff --git a/lib/api/admin/dictionary.rb b/lib/api/admin/dictionary.rb
new file mode 100644
index 00000000000..038c122c021
--- /dev/null
+++ b/lib/api/admin/dictionary.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module API
+  module Admin
+    class Dictionary < ::API::Base
+      feature_category :database
+      urgency :low
+
+      before do
+        authenticated_as_admin!
+      end
+
+      namespace 'admin' do
+        resources 'databases/:database_name/dictionary/tables/:table_name' do
+          desc 'Retrieve dictionary details' do
+            success ::API::Entities::Dictionary::Table
+            failure [
+              { code: 401, message: '401 Unauthorized' },
+              { code: 403, message: '403 Forbidden' },
+              { code: 404, message: '404 Not found' }
+            ]
+          end
+          params do
+            requires :database_name,
+              type: String,
+              values: %w[main ci],
+              desc: 'The database name'
+
+            requires :table_name,
+              type: String,
+              desc: 'The table name'
+          end
+          get do
+            not_found!('Table not found') unless File.exist?(safe_file_path!)
+
+            present table_dictionary, with: Entities::Dictionary::Table
+          end
+        end
+
+        helpers do
+          def table_name
+            params[:table_name]
+          end
+
+          def table_dictionary
+            YAML.load_file(safe_file_path!).with_indifferent_access
+          end
+
+          def safe_file_path!
+            dir = Gitlab::Database::GitlabSchema.dictionary_paths.first.to_s
+            path = Rails.root.join(dir, "#{table_name}.yml").to_s
+
+            Gitlab::PathTraversal.check_allowed_absolute_path_and_path_traversal!(path, [dir])
+
+            path
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 55bb549e5bc..090fbaa7f93 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -181,6 +181,7 @@ module API
         mount ::API::AccessRequests
         mount ::API::Admin::BatchedBackgroundMigrations
         mount ::API::Admin::Ci::Variables
+        mount ::API::Admin::Dictionary
         mount ::API::Admin::InstanceClusters
         mount ::API::Admin::Migrations
         mount ::API::Admin::PlanLimits
diff --git a/lib/api/entities/dictionary/table.rb b/lib/api/entities/dictionary/table.rb
new file mode 100644
index 00000000000..8d4e3fb959d
--- /dev/null
+++ b/lib/api/entities/dictionary/table.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module API
+  module Entities
+    module Dictionary
+      class Table < Grape::Entity
+        expose :table_name, documentation: { type: :string, example: 'users' }
+        expose :feature_categories, documentation: { type: :array, example: ['database'] }
+      end
+    end
+  end
+end
diff --git a/lib/api/helpers/integrations_helpers.rb b/lib/api/helpers/integrations_helpers.rb
index 8737ba8cfff..b5dc72b1576 100644
--- a/lib/api/helpers/integrations_helpers.rb
+++ b/lib/api/helpers/integrations_helpers.rb
@@ -403,8 +403,16 @@ module API
               name: :webhook,
               type: String,
               desc: 'Discord webhook. For example, https://discord.com/api/webhooks/…'
-            }
-          ],
+            },
+            {
+              required: false,
+              name: :branches_to_be_notified,
+              type: String,
+              desc: 'Branches for which notifications are to be sent'
+            },
+            chat_notification_flags,
+            chat_notification_events
+          ].flatten,
           'drone-ci' => [
             {
               required: true,
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index f83648e891d..1f1ead42952 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -7350,6 +7350,9 @@ msgstr ""
 msgid "BillingPlans|Talk to an expert today."
 msgstr ""
 
+msgid "BillingPlans|Then %{move_link_start}move any projects%{move_link_end} you wish to use with your subscription to that group."
+msgstr ""
+
 msgid "BillingPlans|This group uses the plan associated with its parent group."
 msgstr ""
 
@@ -7377,10 +7380,7 @@ msgstr ""
 msgid "BillingPlans|While GitLab is ending availability of the Bronze plan, you can still renew your Bronze subscription one additional time before %{eoa_bronze_plan_end_date}. We are also offering a limited time free upgrade to our Premium Plan (up to 25 users)! Learn more about the changes and offers in our %{announcement_link}."
 msgstr ""
 
-msgid "BillingPlans|You don't have any groups. You'll need to %{create_group_link_start}create one%{create_group_link_end} and %{move_link_start}move this project to it%{move_link_end}."
-msgstr ""
-
-msgid "BillingPlans|You'll have to %{move_link_start}move this project%{move_link_end} to one of your groups."
+msgid "BillingPlans|You don't have any groups. You'll need to %{create_group_link_start}create one%{create_group_link_end} and %{move_link_start}move your projects to it%{move_link_end}."
 msgstr ""
 
 msgid "BillingPlans|Your GitLab.com %{plan} trial will %{strong_open}expire after %{expiration_date}%{strong_close}. You can retain access to the %{plan} features by upgrading below."
diff --git a/scripts/api/create_merge_request_note.rb b/scripts/api/create_merge_request_note.rb
new file mode 100644
index 00000000000..c73987c6961
--- /dev/null
+++ b/scripts/api/create_merge_request_note.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+
+class CreateMergeRequestNote < Base
+  def initialize(options)
+    super
+    @merge_request = options.fetch(:merge_request)
+  end
+
+  def execute(content)
+    client.create_merge_request_comment(
+      project,
+      merge_request.iid,
+      content
+    )
+  end
+
+  private
+
+  attr_reader :merge_request
+end
diff --git a/scripts/generate-message-to-run-e2e-pipeline.rb b/scripts/generate-message-to-run-e2e-pipeline.rb
new file mode 100755
index 00000000000..af18578add6
--- /dev/null
+++ b/scripts/generate-message-to-run-e2e-pipeline.rb
@@ -0,0 +1,106 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require 'gitlab'
+require 'optparse'
+
+require_relative 'api/create_merge_request_note'
+require_relative 'api/commit_merge_requests'
+
+class GenerateMessageToRunE2ePipeline
+  NOTE_PATTERN = /<!-- Run e2e warning begin -->[\s\S]+<!-- Run e2e warning end -->/
+
+  def initialize(options)
+    @options = options
+    @project = @options.fetch(:project)
+
+    # If api_token is nil, it's set to '' to allow unauthenticated requests (for forks).
+    api_token = @options.fetch(:api_token, '')
+
+    warn "No API token given." if api_token.empty?
+
+    @client = ::Gitlab.client(
+      endpoint: options.fetch(:endpoint),
+      private_token: api_token
+    )
+  end
+
+  def execute
+    return unless qa_tests_folders?
+
+    add_note_to_mr unless existing_note
+  end
+
+  private
+
+  attr_reader :project, :client, :options
+
+  def qa_tests_folders?
+    return unless File.exist?(env('ENV_FILE'))
+
+    qa_tests_line = File.open(env('ENV_FILE')).detect { |line| line.include?("QA_TESTS=") }
+    qa_tests_match = qa_tests_line&.match(/'([\s\S]+)'/)
+
+    qa_tests_match && !qa_tests_match[1].include?('_spec.rb') # rubocop:disable Rails/NegateInclude
+  end
+
+  def add_note_to_mr
+    CreateMergeRequestNote.new(
+      options.merge(merge_request: merge_request)
+    ).execute(content)
+  end
+
+  def match?(body)
+    body.match?(NOTE_PATTERN)
+  end
+
+  def existing_note
+    @note ||= client.merge_request_comments(project, merge_request.iid).auto_paginate.detect do |note|
+      match?(note.body)
+    end
+  end
+
+  def merge_request
+    @merge_request ||= CommitMergeRequests.new(
+      options.merge(sha: ENV['CI_MERGE_REQUEST_SOURCE_BRANCH_SHA'])
+    ).execute.first
+  end
+
+  def content
+    <<~MARKDOWN
+      <!-- Run e2e warning begin -->
+      :warning: @#{author_username} Some end-to-end (E2E) tests have been selected based on the stage label on this MR.
+      If not run already, please run the `e2e:package-and-test-ee` job in the `qa` stage
+      and review the results **before merging this MR**. (E2E tests are not run automatically on some MRs due to [runner resource constraints](https://gitlab.com/gitlab-org/gitlab-qa/-/issues/261).)
+
+      If you would like to run all e2e tests, please apply the ~"pipeline:run-all-e2e" label and restart the pipeline.
+
+      Once done, please apply the ✅ emoji on this comment.
+
+      For any questions or help in reviewing the E2E test results, please reach out on the internal #quality Slack channel.
+      <!-- Run e2e warning end -->
+    MARKDOWN
+  end
+
+  def author_username
+    merge_request&.author&.username
+  end
+
+  def env(name)
+    return unless ENV[name] && !ENV[name].strip.empty?
+
+    ENV[name]
+  end
+end
+
+if $PROGRAM_NAME == __FILE__
+  OptionParser.new do |opts|
+    opts.on("-h", "--help", "Prints this help") do
+      puts opts
+      exit
+    end
+  end.parse!
+
+  GenerateMessageToRunE2ePipeline.new(API::DEFAULT_OPTIONS).execute
+end
diff --git a/spec/frontend/fixtures/pipeline_header.rb b/spec/frontend/fixtures/pipeline_header.rb
index 89f548caf72..3fdc45b1194 100644
--- a/spec/frontend/fixtures/pipeline_header.rb
+++ b/spec/frontend/fixtures/pipeline_header.rb
@@ -64,6 +64,32 @@ RSpec.describe "GraphQL Pipeline Header", '(JavaScript fixtures)', type: :reques
     end
   end
 
+  context 'with running pipeline and duration' do
+    let_it_be(:pipeline) do
+      create(
+        :ci_pipeline,
+        project: project,
+        sha: commit.id,
+        ref: 'master',
+        user: user,
+        status: :running,
+        duration: 7210,
+        created_at: 2.hours.ago,
+        started_at: 1.hour.ago
+      )
+    end
+
+    let_it_be(:build) { create(:ci_build, :running, pipeline: pipeline, ref: 'master') }
+
+    it "graphql/pipelines/pipeline_header_running_with_duration.json" do
+      query = get_graphql_query_as_string(query_path)
+
+      post_graphql(query, current_user: user, variables: { fullPath: project.full_path, iid: pipeline.iid })
+
+      expect_graphql_errors_to_be_empty
+    end
+  end
+
   context 'with failed pipeline' do
     let_it_be(:pipeline) do
       create(
diff --git a/spec/frontend/pipelines/mock_data.js b/spec/frontend/pipelines/mock_data.js
index 8bbe0ef78c0..62c0d6e2d91 100644
--- a/spec/frontend/pipelines/mock_data.js
+++ b/spec/frontend/pipelines/mock_data.js
@@ -1,5 +1,6 @@
 import pipelineHeaderSuccess from 'test_fixtures/graphql/pipelines/pipeline_header_success.json';
 import pipelineHeaderRunning from 'test_fixtures/graphql/pipelines/pipeline_header_running.json';
+import pipelineHeaderRunningWithDuration from 'test_fixtures/graphql/pipelines/pipeline_header_running_with_duration.json';
 import pipelineHeaderFailed from 'test_fixtures/graphql/pipelines/pipeline_header_failed.json';
 
 const PIPELINE_RUNNING = 'RUNNING';
@@ -9,7 +10,12 @@ const PIPELINE_FAILED = 'FAILED';
 const threeWeeksAgo = new Date();
 threeWeeksAgo.setDate(threeWeeksAgo.getDate() - 21);
 
-export { pipelineHeaderSuccess, pipelineHeaderRunning, pipelineHeaderFailed };
+export {
+  pipelineHeaderSuccess,
+  pipelineHeaderRunning,
+  pipelineHeaderRunningWithDuration,
+  pipelineHeaderFailed,
+};
 
 export const pipelineRetryMutationResponseSuccess = {
   data: { pipelineRetry: { errors: [] } },
diff --git a/spec/frontend/pipelines/pipeline_details_header_spec.js b/spec/frontend/pipelines/pipeline_details_header_spec.js
index 2fef4924cc7..deaf5c6f72f 100644
--- a/spec/frontend/pipelines/pipeline_details_header_spec.js
+++ b/spec/frontend/pipelines/pipeline_details_header_spec.js
@@ -16,6 +16,7 @@ import getPipelineDetailsQuery from '~/pipelines/graphql/queries/get_pipeline_he
 import {
   pipelineHeaderSuccess,
   pipelineHeaderRunning,
+  pipelineHeaderRunningWithDuration,
   pipelineHeaderFailed,
   pipelineRetryMutationResponseSuccess,
   pipelineCancelMutationResponseSuccess,
@@ -33,6 +34,7 @@ describe('Pipeline details header', () => {
 
   const successHandler = jest.fn().mockResolvedValue(pipelineHeaderSuccess);
   const runningHandler = jest.fn().mockResolvedValue(pipelineHeaderRunning);
+  const runningHandlerWithDuration = jest.fn().mockResolvedValue(pipelineHeaderRunningWithDuration);
   const failedHandler = jest.fn().mockResolvedValue(pipelineHeaderFailed);
 
   const retryMutationHandlerSuccess = jest
@@ -273,6 +275,18 @@ describe('Pipeline details header', () => {
     });
   });
 
+  describe('running pipeline with duration', () => {
+    beforeEach(async () => {
+      createComponent([[getPipelineDetailsQuery, runningHandlerWithDuration]]);
+
+      await waitForPromises();
+    });
+
+    it('does not display pipeline duration text', () => {
+      expect(findPipelineDuration().exists()).toBe(false);
+    });
+  });
+
   describe('actions', () => {
     describe('retry action', () => {
       beforeEach(async () => {
diff --git a/spec/frontend/search/sort/components/app_spec.js b/spec/frontend/search/sort/components/app_spec.js
index 322ce1b16ef..09c295e3ea9 100644
--- a/spec/frontend/search/sort/components/app_spec.js
+++ b/spec/frontend/search/sort/components/app_spec.js
@@ -1,4 +1,4 @@
-import { GlButtonGroup, GlButton, GlDropdown, GlDropdownItem } from '@gitlab/ui';
+import { GlButtonGroup, GlButton, GlCollapsibleListbox, GlListboxItem } from '@gitlab/ui';
 import { shallowMount } from '@vue/test-utils';
 import Vue from 'vue';
 import Vuex from 'vuex';
@@ -35,13 +35,16 @@ describe('GlobalSearchSort', () => {
         ...defaultProps,
         ...props,
       },
+      stubs: {
+        GlCollapsibleListbox,
+      },
     });
   };
 
   const findSortButtonGroup = () => wrapper.findComponent(GlButtonGroup);
-  const findSortDropdown = () => wrapper.findComponent(GlDropdown);
+  const findSortDropdown = () => wrapper.findComponent(GlCollapsibleListbox);
   const findSortDirectionButton = () => wrapper.findComponent(GlButton);
-  const findDropdownItems = () => findSortDropdown().findAllComponents(GlDropdownItem);
+  const findDropdownItems = () => findSortDropdown().findAllComponents(GlListboxItem);
   const findDropdownItemsText = () => findDropdownItems().wrappers.map((w) => w.text());
 
   describe('template', () => {
@@ -89,7 +92,7 @@ describe('GlobalSearchSort', () => {
         });
 
         it('is set correctly', () => {
-          expect(findSortDropdown().attributes('text')).toBe(value);
+          expect(findSortDropdown().props('toggleText')).toBe(value);
         });
       });
     });
@@ -116,14 +119,14 @@ describe('GlobalSearchSort', () => {
 
   describe('actions', () => {
     describe.each`
-      description       | index | value
-      ${'non-sortable'} | ${0}  | ${MOCK_SORT_OPTIONS[0].sortParam}
-      ${'sortable'}     | ${1}  | ${MOCK_SORT_OPTIONS[1].sortParam.desc}
-    `('handleSortChange', ({ description, index, value }) => {
-      describe(`when clicking a ${description} option`, () => {
+      description       | text                          | value
+      ${'non-sortable'} | ${MOCK_SORT_OPTIONS[0].title} | ${MOCK_SORT_OPTIONS[0].sortParam}
+      ${'sortable'}     | ${MOCK_SORT_OPTIONS[1].title} | ${MOCK_SORT_OPTIONS[1].sortParam.desc}
+    `('handleSortChange', ({ description, text, value }) => {
+      describe(`when selecting a ${description} option`, () => {
         beforeEach(() => {
           createComponent();
-          findDropdownItems().at(index).vm.$emit('click');
+          findSortDropdown().vm.$emit('select', text);
         });
 
         it('calls setQuery and applyQuery correctly', () => {
diff --git a/spec/lib/atlassian/jira_connect/client_spec.rb b/spec/lib/atlassian/jira_connect/client_spec.rb
index f1f9dd38947..66ae3658a92 100644
--- a/spec/lib/atlassian/jira_connect/client_spec.rb
+++ b/spec/lib/atlassian/jira_connect/client_spec.rb
@@ -11,9 +11,10 @@ RSpec.describe Atlassian::JiraConnect::Client, feature_category: :integrations d
   let_it_be(:mrs_by_title) { create_list(:merge_request, 4, :unique_branches, :jira_title) }
   let_it_be(:mrs_by_branch) { create_list(:merge_request, 2, :jira_branch) }
   let_it_be(:red_herrings) { create_list(:merge_request, 1, :unique_branches) }
+  let_it_be(:mrs_by_description) { create_list(:merge_request, 2, :unique_branches, :jira_description) }
 
   let_it_be(:pipelines) do
-    (red_herrings + mrs_by_branch + mrs_by_title).map do |mr|
+    (red_herrings + mrs_by_branch + mrs_by_title + mrs_by_description).map do |mr|
       create(:ci_pipeline, merge_request: mr)
     end
   end
@@ -253,7 +254,7 @@ RSpec.describe Atlassian::JiraConnect::Client, feature_category: :integrations d
 
     it 'only sends information about relevant MRs' do
       expect(subject).to receive(:post).with(
-        '/rest/deployments/0.1/bulk', { deployments: have_attributes(size: 6) }
+        '/rest/deployments/0.1/bulk', { deployments: have_attributes(size: 8) }
       ).and_call_original
 
       subject.send(:store_deploy_info, project: project, deployments: deployments)
@@ -378,7 +379,7 @@ RSpec.describe Atlassian::JiraConnect::Client, feature_category: :integrations d
 
     it 'only sends information about relevant MRs' do
       expect(subject).to receive(:post)
-        .with('/rest/builds/0.1/bulk', { builds: have_attributes(size: 6) })
+        .with('/rest/builds/0.1/bulk', { builds: have_attributes(size: 8) })
         .and_call_original
 
       subject.send(:store_build_info, project: project, pipelines: pipelines)
diff --git a/spec/lib/atlassian/jira_connect/serializers/deployment_entity_spec.rb b/spec/lib/atlassian/jira_connect/serializers/deployment_entity_spec.rb
index f6fca39fa68..523b7ddaa09 100644
--- a/spec/lib/atlassian/jira_connect/serializers/deployment_entity_spec.rb
+++ b/spec/lib/atlassian/jira_connect/serializers/deployment_entity_spec.rb
@@ -69,7 +69,7 @@ RSpec.describe Atlassian::JiraConnect::Serializers::DeploymentEntity, feature_ca
       subject.deployable.update!(pipeline: pipeline)
     end
 
-    %i[jira_branch jira_title].each do |trait|
+    %i[jira_branch jira_title jira_description].each do |trait|
       context "because it belongs to an MR with a #{trait}" do
         let(:merge_request) { create(:merge_request, trait) }
 
diff --git a/spec/models/error_tracking/project_error_tracking_setting_spec.rb b/spec/models/error_tracking/project_error_tracking_setting_spec.rb
index 34be6ec7fa9..a86283ea4ba 100644
--- a/spec/models/error_tracking/project_error_tracking_setting_spec.rb
+++ b/spec/models/error_tracking/project_error_tracking_setting_spec.rb
@@ -300,7 +300,7 @@ RSpec.describe ErrorTracking::ProjectErrorTrackingSetting, feature_category: :er
         it { expect(result[:issue].gitlab_commit_path).to eq(nil) }
       end
 
-      context 'when repo commit matches first relase version' do
+      context 'when repo commit matches first release version' do
         let(:commit) { instance_double(Commit, id: commit_id) }
         let(:repository) { instance_double(Repository, commit: commit) }
 
diff --git a/spec/requests/api/admin/dictionary_spec.rb b/spec/requests/api/admin/dictionary_spec.rb
new file mode 100644
index 00000000000..effd3572423
--- /dev/null
+++ b/spec/requests/api/admin/dictionary_spec.rb
@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe API::Admin::Dictionary, feature_category: :database do
+  let(:admin) { create(:admin) }
+  let(:path) { "/admin/databases/main/dictionary/tables/achievements" }
+
+  describe 'GET admin/databases/:database_name/dictionary/tables/:table_name' do
+    it_behaves_like "GET request permissions for admin mode"
+
+    subject(:show_table_dictionary) do
+      get api(path, admin, admin_mode: true)
+    end
+
+    context 'when the database does not exist' do
+      it 'returns bad request' do
+        get api("/admin/databases/#{non_existing_record_id}/dictionary/tables/achievements", admin, admin_mode: true)
+
+        expect(response).to have_gitlab_http_status(:bad_request)
+      end
+    end
+
+    context 'when the table does not exist' do
+      it 'returns not found' do
+        get api("/admin/databases/main/dictionary/tables/#{non_existing_record_id}", admin, admin_mode: true)
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    context 'with a malicious table_name' do
+      it 'returns an error' do
+        get api("/admin/databases/main/dictionary/tables/%2E%2E%2Fpasswords.yml", admin, admin_mode: true)
+
+        expect(response).to have_gitlab_http_status(:error)
+      end
+    end
+
+    context 'when the params are correct' do
+      let(:dictionary_dir) { Rails.root.join('spec/fixtures') }
+      let(:path_file) { Rails.root.join(dictionary_dir, 'achievements.yml') }
+
+      it 'fetches the table dictionary' do
+        allow(Gitlab::Database::GitlabSchema).to receive(:dictionary_paths).and_return([dictionary_dir])
+
+        expect(Gitlab::PathTraversal).to receive(:check_allowed_absolute_path_and_path_traversal!).twice.with(
+          path_file.to_s, [dictionary_dir.to_s]).and_call_original
+
+        show_table_dictionary
+
+        aggregate_failures "testing response" do
+          expect(json_response['table_name']).to eq('achievements')
+          expect(json_response['feature_categories']).to eq(['feature_category_example'])
+        end
+      end
+    end
+  end
+end
diff --git a/spec/requests/api/integrations_spec.rb b/spec/requests/api/integrations_spec.rb
index 8334d6b6832..6fd2aafd546 100644
--- a/spec/requests/api/integrations_spec.rb
+++ b/spec/requests/api/integrations_spec.rb
@@ -68,7 +68,6 @@ RSpec.describe API::Integrations, feature_category: :integrations do
         let(:missing_attributes) do
           {
             datadog: %i[archive_trace_events],
-            discord: %i[branches_to_be_notified notify_only_broken_pipelines],
             hangouts_chat: %i[notify_only_broken_pipelines],
             jira: %i[issues_enabled project_key jira_issue_regex jira_issue_prefix vulnerabilities_enabled vulnerabilities_issuetype],
             mattermost: %i[deployment_channel labels_to_be_notified],
diff --git a/spec/scripts/api/create_merge_request_note_spec.rb b/spec/scripts/api/create_merge_request_note_spec.rb
new file mode 100644
index 00000000000..74cc68146c5
--- /dev/null
+++ b/spec/scripts/api/create_merge_request_note_spec.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'fast_spec_helper'
+require_relative '../../../scripts/api/create_merge_request_note'
+
+RSpec.describe CreateMergeRequestNote, feature_category: :tooling do
+  describe '#execute' do
+    let(:project_id) { 12345 }
+    let(:iid) { 1 }
+    let(:content) { 'test123' }
+
+    let(:options) do
+      {
+        api_token: 'token',
+        endpoint: 'https://example.gitlab.com',
+        project: project_id,
+        merge_request: Struct.new(:iid).new(iid)
+      }
+    end
+
+    subject { described_class.new(options) }
+
+    it 'requests create_merge_request_comment from the gitlab client' do
+      client = double('Gitlab::Client') # rubocop:disable RSpec/VerifiedDoubles
+
+      expect(Gitlab).to receive(:client)
+                          .with(endpoint: options[:endpoint], private_token: options[:api_token])
+                          .and_return(client)
+
+      expect(client).to receive(:create_merge_request_comment).with(
+        project_id, iid, content
+      ).and_return(true)
+
+      subject.execute(content)
+    end
+  end
+end
diff --git a/spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb b/spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb
new file mode 100644
index 00000000000..aee16334003
--- /dev/null
+++ b/spec/scripts/generate_message_to_run_e2e_pipeline_spec.rb
@@ -0,0 +1,279 @@
+# frozen_string_literal: true
+
+# rubocop:disable RSpec/VerifiedDoubles
+
+require 'fast_spec_helper'
+require_relative '../../scripts/generate-message-to-run-e2e-pipeline'
+require_relative '../support/helpers/stub_env'
+
+RSpec.describe GenerateMessageToRunE2ePipeline, feature_category: :tooling do
+  include StubENV
+
+  let(:options) do
+    {
+      project: '13083',
+      pipeline_id: '13083',
+      api_token: 'asdf1234',
+      endpoint: 'https://gitlab.com/api/v4'
+    }
+  end
+
+  let(:client) { double('Gitlab::Client') }
+
+  let(:note_content) do
+    <<~MARKDOWN
+      <!-- Run e2e warning begin -->
+      Some note
+      <!-- Run e2e warning end -->
+    MARKDOWN
+  end
+
+  before do
+    allow(Gitlab).to receive(:client)
+                       .with(endpoint: options[:endpoint], private_token: options[:api_token])
+                       .and_return(client)
+  end
+
+  subject { described_class.new(options) }
+
+  describe '#execute' do
+    let(:commit_merge_request) do
+      Struct.new(:author, :iid).new(
+        Struct.new(:id, :username).new(
+          '2',
+          'test_user'
+        ),
+        '123'
+      )
+    end
+
+    let(:merge_request) { instance_double(CommitMergeRequests, execute: [commit_merge_request]) }
+    let(:merge_request_note_client) { instance_double(CreateMergeRequestNote, execute: true) }
+
+    before do
+      stub_env(
+        'CI_MERGE_REQUEST_SOURCE_BRANCH_SHA' => 'bfcd2b9b5cad0b889494ce830697392c8ca11257'
+      )
+
+      allow(CommitMergeRequests).to receive(:new)
+                                      .with(options.merge(sha: ENV['CI_MERGE_REQUEST_SOURCE_BRANCH_SHA']))
+                                      .and_return(merge_request)
+    end
+
+    context 'when there are qa_test_folders' do
+      before do
+        allow(subject).to receive(:qa_tests_folders?).and_return(true)
+      end
+
+      context 'when there is no existing note' do
+        before do
+          allow(subject).to receive(:existing_note).and_return(nil)
+          allow(subject).to receive(:content).and_return(note_content)
+
+          allow(client).to receive(:create_merge_request_comment)
+                             .with(options[:project], '123', note_content)
+        end
+
+        it 'adds a new note' do
+          expect(CreateMergeRequestNote).to receive(:new)
+                                              .with(options.merge(merge_request: commit_merge_request))
+                                              .and_return(merge_request_note_client)
+
+          expect(merge_request_note_client).to receive(:execute).with(note_content)
+
+          subject.execute
+        end
+      end
+
+      context 'when there is existing note' do
+        before do
+          allow(subject).to receive(:existing_note).and_return(true)
+        end
+
+        it 'does not add a new note' do
+          expect(CreateMergeRequestNote).not_to receive(:new)
+
+          subject.execute
+        end
+      end
+    end
+
+    context 'when there are no qa_test_folders' do
+      before do
+        allow(subject).to receive(:qa_tests_folders?).and_return(false)
+      end
+
+      it 'does not add a new note' do
+        expect(CreateMergeRequestNote).not_to receive(:new)
+
+        subject.execute
+      end
+    end
+  end
+
+  describe '#qa_tests_folders?' do
+    before do
+      allow(File).to receive(:exist?).with(any_args).and_return(true)
+      allow(File).to receive(:open).with(any_args).and_return(file_contents)
+    end
+
+    context 'when QA_TESTS is empty' do
+      let(:file_contents) do
+        %w[
+          QA_SUITES='QA::Scenario::Test::Instance::All'
+          QA_TESTS=''
+          QA_FEATURE_FLAGS=''
+        ]
+      end
+
+      it 'returns false' do
+        expect(subject.send(:qa_tests_folders?)).to be_falsy
+      end
+    end
+
+    context 'when QA_TESTS has a spec file' do
+      let(:file_contents) do
+        %w[
+          QA_SUITES='QA::Scenario::Test::Instance::All'
+          QA_TESTS='qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb'
+          QA_FEATURE_FLAGS=''
+        ]
+      end
+
+      it 'returns false' do
+        expect(subject.send(:qa_tests_folders?)).to be_falsy
+      end
+    end
+
+    context 'when QA_TESTS has folders' do
+      let(:file_contents) do
+        [
+          "QA_SUITES='QA::Scenario::Test::Instance::All'",
+          "QA_TESTS='qa/specs/features/browser_ui/1_manage/ qa/specs/features/browser_ui/2_plan'",
+          "QA_FEATURE_FLAGS=''"
+        ]
+      end
+
+      it 'returns true' do
+        expect(subject.send(:qa_tests_folders?)).to be_truthy
+      end
+    end
+  end
+
+  describe '#match?' do
+    it 'returns true for a note that matches NOTE_PATTERN' do
+      expect(subject.send(:match?, note_content)).to be_truthy
+    end
+
+    it 'returns false for a note that does not match NOTE_PATTERN' do
+      expect(subject.send(:match?, 'Some random text')).to be_falsy
+    end
+  end
+
+  describe '#existing_note' do
+    let(:mr_comments_response) do
+      [
+        double(:mr_comment, id: 1, body: 'foo'),
+        double(:mr_comment, id: 2, body: 'bar'),
+        existing_note
+      ]
+    end
+
+    before do
+      allow(client)
+        .to receive(:merge_request_comments)
+              .with(any_args)
+              .and_return(double(auto_paginate: mr_comments_response))
+      allow(subject).to receive(:merge_request).and_return(double(:merge_request, id: 2, iid: 123))
+    end
+
+    context 'when note exists' do
+      let(:existing_note) do
+        double(
+          :mr_comment,
+          id: 3,
+          body: note_content
+        )
+      end
+
+      it 'returns the existing note' do
+        expect(subject.send(:existing_note)).to eq existing_note
+      end
+    end
+
+    context 'when note doesnt exists' do
+      let(:existing_note) do
+        double(
+          :mr_comment,
+          id: 3,
+          body: 'random content'
+        )
+      end
+
+      it 'returns nil' do
+        expect(subject.send(:existing_note)).to eq nil
+      end
+    end
+  end
+
+  describe '#content' do
+    let(:author_username) { 'sam_smith' }
+
+    let(:expected_content) do
+      <<~MARKDOWN
+      <!-- Run e2e warning begin -->
+      :warning: @#{author_username} Some end-to-end (E2E) tests have been selected based on the stage label on this MR.
+      If not run already, please run the `e2e:package-and-test-ee` job in the `qa` stage
+      and review the results **before merging this MR**. (E2E tests are not run automatically on some MRs due to [runner resource constraints](https://gitlab.com/gitlab-org/gitlab-qa/-/issues/261).)
+
+      If you would like to run all e2e tests, please apply the ~"pipeline:run-all-e2e" label and restart the pipeline.
+
+      Once done, please apply the ✅ emoji on this comment.
+
+      For any questions or help in reviewing the E2E test results, please reach out on the internal #quality Slack channel.
+      <!-- Run e2e warning end -->
+      MARKDOWN
+    end
+
+    before do
+      allow(subject).to receive(:merge_request).and_return(double(:merge_request,
+        author: double(username: author_username)))
+    end
+
+    it 'returns content text with author username' do
+      expect(subject.send(:content)).to eq expected_content
+    end
+  end
+
+  describe '#author_username' do
+    let(:author_username) { 'sam_smith' }
+
+    before do
+      allow(subject).to receive(:merge_request).and_return(double(:merge_request,
+        author: double(username: author_username)))
+    end
+
+    it 'returns nil' do
+      expect(subject.send(:author_username)).to eq author_username
+    end
+  end
+
+  describe '#env' do
+    before do
+      stub_env(
+        'VAR_WITH_VALUE' => 'bfcd2b9b5cad0b889494ce830697392c8ca11257',
+        'EMPTY_VAR' => ' '
+      )
+    end
+
+    it 'returns env var when not empty' do
+      expect(subject.send(:env, 'VAR_WITH_VALUE')).to eq 'bfcd2b9b5cad0b889494ce830697392c8ca11257'
+    end
+
+    it 'returns nil when env var is empty' do
+      expect(subject.send(:env, 'EMPTY_VAR')).to be_nil
+    end
+  end
+end
+
+# rubocop:enable RSpec/VerifiedDoubles