Add latest changes from gitlab-org/gitlab@master

doc/administration/auth/ldap-ee.md

@@ -470,7 +470,7 @@ step of the sync.
    sudo gitlab-rails console
 
    # For installations from source
-   sudo -u git -H bundle exec rails console production
+   sudo -u git -H bundle exec rails console -e production
    ```
 
 1. Set the log level to debug (only for this session):

doc/administration/high_availability/redis.md

@@ -966,7 +966,7 @@ To make sure your configuration is correct:
    sudo gitlab-rails console
 
    # For source installations
-   sudo -u git rails console production
+   sudo -u git rails console -e production
    ```
 
 1. Run in the console:

doc/administration/snippets/index.md

@@ -40,7 +40,7 @@ The steps to configure this setting through the Rails console are:
    sudo gitlab-rails console
 
    # For installations from source
-   sudo -u git -H bundle exec rails console production
+   sudo -u git -H bundle exec rails console -e production
    ```
 
 1. Update the snippets maximum file size:

doc/administration/troubleshooting/debug.md

@@ -11,13 +11,13 @@ an SMTP server, but you're not seeing mail delivered. Here's how to check the se
 1. Run a Rails console:
 
    ```shell
-   sudo gitlab-rails console production
+   sudo gitlab-rails console -e production
    ```
 
    or for source installs:
 
    ```shell
-   bundle exec rails console production
+   bundle exec rails console -e production
    ```
 
 1. Look at the ActionMailer `delivery_method` to make sure it matches what you

doc/development/contributing/issue_workflow.md

@@ -89,7 +89,7 @@ Following is a non-exhaustive list of facet labels:
 
 - ~enhancement: This label can refine an issue that has the ~feature label.
 - ~"master:broken": This label can refine an issue that has the ~bug label.
-- ~"master:flaky": This label can refine an issue that has the ~bug label.
+- ~"failure::flaky-test": This label can refine an issue that has the ~bug label.
 - ~"technical debt": This label can refine an issue that has the ~backstage label.
 - ~"static analysis": This label can refine an issue that has the ~backstage label.
 - ~"ci-build": This label can refine an issue that has the ~backstage label.

doc/development/testing_guide/end_to_end/index.md

@@ -88,6 +88,27 @@ subgraph "gitlab-qa pipeline"
 Please note, we plan to [add more specific information](https://gitlab.com/gitlab-org/quality/team-tasks/issues/156)
 about the tests included in each job/scenario that runs in `gitlab-qa`.
 
+#### With Pipeline for Merged Results
+
+In a Pipeline for Merged Results, the pipeline runs on a new ref that contains the merge result of the source and target branch.
+However, this ref is not available to the `gitlab-qa` pipeline.
+
+For this reason, the end-to-end tests on a Pipeline for Merged Results would use the head of the merge request source branch.
+
+```mermaid
+graph LR
+
+A["a1b1c1 - branch HEAD (CI_MERGE_REQUEST_SOURCE_BRANCH_SHA)"]
+B["x1y1z1 - master HEAD"]
+C["d1e1f1 - merged results (CI_COMMIT_SHA)"]
+
+A --> C
+B --> C
+
+A --> E["E2E tests"]
+C --> D["Pipeline for merged results"]
+ ```
+
 ##### Running custom tests
 
 The [existing scenarios](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/docs/what_tests_can_be_run.md)

doc/security/unlock_user.md

@@ -13,7 +13,7 @@ To unlock a locked user:
 
    ```shell
    ## For Omnibus GitLab
-   sudo gitlab-rails console production
+   sudo gitlab-rails console -e production
 
    ## For installations from source
    sudo -u git -H bundle exec rails console RAILS_ENV=production

doc/update/restore_after_failure.md

@@ -64,7 +64,7 @@ migrations are marked complete.
 
 ```
 # Source install
-sudo -u git -H bundle exec rails console production
+sudo -u git -H bundle exec rails console -e production
 
 # Omnibus install
 sudo gitlab-rails console

doc/user/project/integrations/slack.md

@@ -52,10 +52,10 @@ the below rails console script.
 
 ```shell
 # start a rails console:
-sudo gitlab-rails console production
+sudo gitlab-rails console -e production
 
 # or for source installs:
-bundle exec rails console production
+bundle exec rails console -e production
 ```
 
 ```ruby

qa/qa/page/group/menu.rb

@@ -24,6 +24,12 @@ module QA
           end
         end
 
+        def click_settings
+          within_sidebar do
+            click_element(:group_settings_item)
+          end
+        end
+
         def click_contribution_analytics_item
           hover_element(:analytics_link) do
             within_submenu(:analytics_sidebar_submenu) do

scripts/trigger-build

@@ -84,13 +84,14 @@ module Trigger
     end
 
     def base_variables
+      # Use CI_MERGE_REQUEST_SOURCE_BRANCH_SHA for omnibus checkouts due to pipeline for merged results
       {
         'GITLAB_REF_SLUG' => ENV['CI_COMMIT_TAG'] ? ENV['CI_COMMIT_REF_NAME'] : ENV['CI_COMMIT_REF_SLUG'],
         'TRIGGERED_USER' => ENV['TRIGGERED_USER'] || ENV['GITLAB_USER_NAME'],
         'TRIGGER_SOURCE' => ENV['CI_JOB_URL'],
         'TOP_UPSTREAM_SOURCE_PROJECT' => ENV['CI_PROJECT_PATH'],
         'TOP_UPSTREAM_SOURCE_JOB' => ENV['CI_JOB_URL'],
-        'TOP_UPSTREAM_SOURCE_SHA' => ENV['CI_COMMIT_SHA'],
+        'TOP_UPSTREAM_SOURCE_SHA' => ENV['CI_MERGE_REQUEST_SOURCE_BRANCH_SHA'],
         'TOP_UPSTREAM_SOURCE_REF' => ENV['CI_COMMIT_REF_NAME'],
         'TOP_UPSTREAM_MERGE_REQUEST_PROJECT_ID' => ENV['CI_MERGE_REQUEST_PROJECT_ID'],
         'TOP_UPSTREAM_MERGE_REQUEST_IID' => ENV['CI_MERGE_REQUEST_IID']
@@ -125,8 +126,9 @@ module Trigger
     end
 
     def extra_variables
+      # Use CI_MERGE_REQUEST_SOURCE_BRANCH_SHA for omnibus checkouts due to pipeline for merged results
       {
-        'GITLAB_VERSION' => ENV['CI_COMMIT_SHA'],
+        'GITLAB_VERSION' => ENV['CI_MERGE_REQUEST_SOURCE_BRANCH_SHA'],
         'ALTERNATIVE_SOURCES' => 'true',
         'ee' => Trigger.ee? ? 'true' : 'false',
         'QA_BRANCH' => ENV['QA_BRANCH'] || 'master'
@@ -192,7 +194,7 @@ module Trigger
 
       Gitlab.create_commit_comment(
         ENV['CI_PROJECT_PATH'],
-        ENV['CI_COMMIT_SHA'],
+        ENV['CI_MERGE_REQUEST_SOURCE_BRANCH_SHA'],
         "The [`#{ENV['CI_JOB_NAME']}`](#{ENV['CI_JOB_URL']}) job from pipeline #{ENV['CI_PIPELINE_URL']} triggered #{downstream_pipeline.web_url} downstream.")
 
     rescue Gitlab::Error::Error => error