Add latest changes from gitlab-org/gitlab@master

tedyage · Oct 11, 2022 · 14ae125 · 14ae125
1 parent fd31bd1
commit 14ae125
Show file tree

Hide file tree

Showing 161 changed files with 136,632 additions and 24,606 deletions.
diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
@@ -4,9 +4,9 @@
 
 * @gitlab-org/maintainers/rails-backend @gitlab-org/maintainers/frontend @gitlab-org/maintainers/database @gl-quality/qe-maintainers @gitlab-org/delivery @gitlab-org/maintainers/cicd-templates @kwiebers @nolith @jacobvosmaer-gitlab @gitlab-org/tw-leadership
 
-CODEOWNERS @clefelhocz1 @timzallmann @cdu1 @wayne @dsatcher @sgoldstein @jeromezng @stanhu @gitlab-org/tw-leadership
-docs/CODEOWNERS @clefelhocz1 @timzallmann @cdu1 @wayne @dsatcher @sgoldstein @jeromezng @stanhu @gitlab-org/tw-leadership
-.gitlab/CODEOWNERS @clefelhocz1 @timzallmann @cdu1 @wayne @dsatcher @sgoldstein @jeromezng @stanhu @gitlab-org/tw-leadership
+CODEOWNERS @gitlab-org/development-leaders @gitlab-org/tw-leadership
+docs/CODEOWNERS @gitlab-org/development-leaders @gitlab-org/tw-leadership
+.gitlab/CODEOWNERS @gitlab-org/development-leaders @gitlab-org/tw-leadership
 
 ## Allows release tooling to update the Gitaly Version
 GITALY_SERVER_VERSION @project_278964_bot6 @gitlab-org/maintainers/rails-backend @gitlab-org/delivery

diff --git a/.gitlab/ci/package-and-test/main.gitlab-ci.yml b/.gitlab/ci/package-and-test/main.gitlab-ci.yml
@@ -4,7 +4,6 @@ default:
   interruptible: true
 
 include:
-  - local: .gitlab/ci/global.gitlab-ci.yml
   - local: .gitlab/ci/package-and-test/rules.gitlab-ci.yml
   - local: .gitlab/ci/package-and-test/variables.gitlab-ci.yml
   - project: gitlab-org/quality/pipeline-common
@@ -30,13 +29,12 @@ stages:
 .ruby-image:
   image: ${REGISTRY_HOST}/${REGISTRY_GROUP}/gitlab-build-images/debian-bullseye-ruby-${RUBY_VERSION}:bundler-2.3
 
-.bundle-install:
+.qa-install:
+  variables:
+    BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES: "true"
+    BUNDLE_SILENCE_ROOT_WARNING: "true"
   extends:
     - .gitlab-qa-install
-    - .qa-cache
-  variables:
-    RUN_WITH_BUNDLE: "true" # installs and runs gitlab-qa via bundler
-    QA_PATH: qa
 
 .omnibus-env:
   variables:
@@ -63,14 +61,16 @@ stages:
 .qa:
   extends:
     - .qa-base
-    - .bundle-install
+    - .qa-install
     - .gitlab-qa-report
   stage: test
   tags:
     - e2e
   needs:
-    - trigger-omnibus
-    - download-knapsack-report
+    - job: trigger-omnibus
+      optional: true
+    - job: download-knapsack-report
+      artifacts: true
   variables:
     QA_GENERATE_ALLURE_REPORT: "true"
     QA_CAN_TEST_PRAEFECT: "false"
@@ -84,6 +84,18 @@ stages:
 # ==========================================
 # Prepare stage
 # ==========================================
+check-release-set:
+  extends: .rules:prepare
+  stage: .pre
+  script:
+    - |
+      if [ -z "$RELEASE" ]; then
+        echo "E2E test pipeline requires omnibus installation docker image to be set via $RELEASE environment variable"
+        exit 1
+      else
+        echo "Omnibus installation image is set to '$RELEASE'"
+      fi
+
 dont-interrupt-me:
   extends: .rules:dont-interrupt
   stage: .pre
@@ -94,11 +106,11 @@ dont-interrupt-me:
 trigger-omnibus-env:
   extends:
     - .omnibus-env
-    - .rules:prepare
+    - .rules:omnibus-build
   stage: .pre
 
 trigger-omnibus:
-  extends: .rules:prepare
+  extends: .rules:omnibus-build
   stage: .pre
   needs:
     - trigger-omnibus-env
@@ -127,30 +139,34 @@ trigger-omnibus:
 
 download-knapsack-report:
   extends:
-    - .bundle-install
-    - .ruby-image
+    - .gitlab-qa-image
     - .rules:prepare
   stage: .pre
+  variables:
+    KNAPSACK_DIR: ${CI_PROJECT_DIR}/qa/knapsack
+    GIT_STRATEGY: none
   script:
+    # when using qa-image, code runs in /home/gitlab/qa folder
     - bundle exec rake "knapsack:download[test]"
+    - mkdir -p "$KNAPSACK_DIR" && cp knapsack/*.json "${KNAPSACK_DIR}/"
   allow_failure: true
   artifacts:
     paths:
-      - qa/knapsack/ee-*.json
+      - qa/knapsack/*.json
     expire_in: 1 day
 
-# e2e test jobs run on separate runner which has separate cache setup
 cache-gems:
   extends:
-    - .bundle-install
+    - .qa-install
     - .ruby-image
-    - .qa-cache-push
     - .rules:prepare
   stage: .pre
   tags:
     - e2e
   script:
     - echo "Populated qa cache"
+  cache:
+    policy: pull-push
 
 # ==========================================
 # Test stage
@@ -168,7 +184,8 @@ _ee:quarantine:
     - .qa
     - .rules:test:manual
   needs:
-    - trigger-omnibus
+    - job: trigger-omnibus
+      optional: true
   stage: test
   variables:
     QA_RSPEC_TAGS: --tag quarantine
@@ -343,7 +360,7 @@ ee:update-minor:
     UPDATE_TYPE: minor
     QA_RSPEC_TAGS: --tag smoke
   rules:
-    - !reference [.rules:test:qa, rules]
+    - !reference [.rules:test:update, rules]
     - if: $QA_SUITES =~ /Test::Instance::Smoke/
     - !reference [.rules:test:manual, rules]
 
@@ -355,7 +372,7 @@ ee:update-major:
     UPDATE_TYPE: major
     QA_RSPEC_TAGS: --tag smoke
   rules:
-    - !reference [.rules:test:qa, rules]
+    - !reference [.rules:test:update, rules]
     - if: $QA_SUITES =~ /Test::Instance::Smoke/
     - !reference [.rules:test:manual, rules]
 
@@ -567,15 +584,15 @@ e2e-test-report:
 upload-knapsack-report:
   extends:
     - .generate-knapsack-report-base
-    - .bundle-install
+    - .qa-install
     - .ruby-image
     - .rules:report:process-results
   stage: report
   when: always
 
 relate-test-failures:
   extends:
-    - .bundle-install
+    - .qa-install
     - .ruby-image
     - .rules:report:process-results
   stage: report
@@ -593,7 +610,7 @@ relate-test-failures:
 
 generate-test-session:
   extends:
-    - .bundle-install
+    - .qa-install
     - .ruby-image
     - .rules:report:process-results
   stage: report
@@ -616,7 +633,7 @@ generate-test-session:
 notify-slack:
   extends:
     - .notify-slack-qa
-    - .bundle-install
+    - .qa-install
     - .ruby-image
     - .rules:report:process-results
   stage: notify

diff --git a/.gitlab/ci/package-and-test/rules.gitlab-ci.yml b/.gitlab/ci/package-and-test/rules.gitlab-ci.yml
@@ -49,6 +49,12 @@
       when: manual
       allow_failure: true
 
+.rules:omnibus-build:
+  rules:
+    - if: $SKIP_OMNIBUS_TRIGGER == "true"
+      when: never
+    - when: always
+
 # ------------------------------------------
 # Test
 # ------------------------------------------
@@ -99,11 +105,21 @@
     - *qa-framework-changes
     - *feature-flags-set-manual
 
+.rules:test:update:
+  rules:
+    # skip upgrade jobs if gitlab version is not provided
+    # these jobs need gitlab version because we can't reliably detect it from just the image
+    - if: $GITLAB_VERSION == null
+      when: never
+    - !reference [.rules:test:qa, rules]
+
 # ------------------------------------------
 # Report
 # ------------------------------------------
 .rules:report:allure-report:
   rules:
+    - if: $SKIP_ALLURE_REPORT == "true"
+      when: never
     - when: always
 
 .rules:report:process-results:

diff --git a/.gitlab/ci/package-and-test/variables.gitlab-ci.yml b/.gitlab/ci/package-and-test/variables.gitlab-ci.yml
@@ -1,7 +1,6 @@
 # Default variables for package-and-test
 
 variables:
-  RELEASE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/build/omnibus-gitlab-mirror/gitlab-ee:${CI_COMMIT_SHA}"
   SKIP_REPORT_IN_ISSUES: "true"
   OMNIBUS_GITLAB_CACHE_UPDATE: "false"
   OMNIBUS_GITLAB_RUBY3_BUILD: "false"

diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
@@ -76,6 +76,10 @@ e2e:package-and-test:
     - e2e-test-pipeline-generate
   variables:
     SKIP_MESSAGE: Skipping package-and-test due to mr containing only quarantine changes!
+    RELEASE: "${REGISTRY_HOST}/${REGISTRY_GROUP}/build/omnibus-gitlab-mirror/gitlab-ee:${CI_COMMIT_SHA}"
+    GITLAB_QA_IMAGE: "${CI_REGISTRY_IMAGE}/gitlab-ee-qa:${CI_COMMIT_SHA}"
+    RUN_WITH_BUNDLE: "true" # instructs pipeline to install and run gitlab-qa gem via bundler
+    QA_PATH: qa # sets the optional path for bundler to run from
   trigger:
     strategy: depend
     forward:

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -803,3 +803,17 @@ Cop/RedisQueueUsage:
     - 'lib/gitlab/redis.rb'
     - 'lib/system_check/app/redis_version_check.rb'
     - 'lib/gitlab/mail_room.rb'
+
+Cop/SidekiqApiUsage:
+  Enabled: true
+  Exclude:
+    - '{,ee/,jh/}spec/**/*'
+    - 'db/post_migrate/**/*'
+    - 'lib/gitlab/sidekiq_middleware/**/*'
+    - 'lib/gitlab/background_migration/**/*'
+    - 'lib/gitlab/hashed_storage/migrator.rb'
+    - 'lib/api/sidekiq_metrics.rb'
+    - 'lib/gitlab/sidekiq_config.rb'
+    - 'lib/gitlab/sidekiq_queue.rb'
+    - 'config/initializers/sidekiq.rb'
+    - 'config/initializers/forbid_sidekiq_in_transactions.rb'
diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-988417a6808a9096745326ac1530f5c621b7fce1
+7a6ddce1d044e41ac9234e30cda62d85cbbc2a54
diff --git a/app/assets/javascripts/blob/components/table_contents.vue b/app/assets/javascripts/blob/components/table_contents.vue
@@ -26,6 +26,8 @@ export default {
       } else if (blobViewerAttr('data-loaded') === 'true') {
         this.isHidden = false;
         this.generateHeaders();
+
+        this.observer.disconnect();
       }
     });
 
@@ -47,13 +49,11 @@ export default {
       if (headers.length) {
         const firstHeader = getHeaderNumber(headers[0]);
 
-        headers.forEach((el) => {
-          this.items.push({
-            text: el.textContent.trim(),
-            anchor: el.querySelector('a').getAttribute('id'),
-            spacing: Math.max((getHeaderNumber(el) - firstHeader) * 8, 0),
-          });
-        });
+        this.items = headers.map((el) => ({
+          text: el.textContent.trim(),
+          anchor: el.querySelector('a').getAttribute('id'),
+          spacing: Math.max((getHeaderNumber(el) - firstHeader) * 8, 0),
+        }));
       }
     },
   },

diff --git a/app/assets/javascripts/editor/schema/ci.json b/app/assets/javascripts/editor/schema/ci.json
@@ -372,9 +372,9 @@
           "additionalProperties": false,
           "properties": {
             "project": {
-              "description": "Path to the project, e.g. `group/project`, or `group/sub-group/project`.",
+              "description": "Path to the project, e.g. `group/project`, or `group/sub-group/project` [Learn more](https://docs.gitlab.com/ee/ci/yaml/index.html#includefile).",
               "type": "string",
-              "pattern": "\\S/\\S|\\$(\\S+)"
+              "pattern": "(?:\\S/\\S|\\$\\S+)"
             },
             "ref": {
               "description": "Branch/Tag/Commit-hash for the target project.",
@@ -1617,7 +1617,7 @@
                 "project": {
                   "description": "Path to the project, e.g. `group/project`, or `group/sub-group/project`.",
                   "type": "string",
-                  "pattern": "\\S/\\S"
+                  "pattern": "(?:\\S/\\S|\\$\\S+)"
                 },
                 "branch": {
                   "description": "The branch name that a downstream pipeline will use",
@@ -1727,7 +1727,7 @@
                               "project": {
                                 "description": "Path to another private project under the same GitLab instance, like `group/project` or `group/sub-group/project`.",
                                 "type": "string",
-                                "pattern": "\\S/\\S"
+                                "pattern": "(?:\\S/\\S|\\$\\S+)"
                               },
                               "ref": {
                                 "description": "Branch/Tag/Commit hash for the target project.",
@@ -1778,9 +1778,9 @@
               }
             },
             {
-              "markdownDescription": "Path to the project, e.g. `group/project`, or `group/sub-group/project`. [Learn More](https://docs.gitlab.com/ee/ci/pipelines/multi_project_pipelines.html#define-multi-project-pipelines-in-your-gitlab-ciyml-file).",
+              "markdownDescription": "Path to the project, e.g. `group/project`, or `group/sub-group/project`. [Learn More](https://docs.gitlab.com/ee/ci/yaml/index.html#trigger).",
               "type": "string",
-              "pattern": "\\S/\\S"
+              "pattern": "(?:\\S/\\S|\\$\\S+)"
             }
           ]
         },

diff --git a/app/assets/stylesheets/framework.scss b/app/assets/stylesheets/framework.scss
@@ -42,7 +42,6 @@
 @import 'framework/notes';
 @import 'framework/tabs';
 @import 'framework/timeline';
-@import 'framework/toggle';
 @import 'framework/typography';
 @import 'framework/zen';
 @import 'framework/wells';

diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
@@ -44,12 +44,6 @@
   }
 }
 
-.div-dropzone-alert {
-  margin-top: 5px;
-  margin-bottom: 0;
-  transition: opacity 200ms ease-in-out;
-}
-
 .md-header {
   .nav-links {
     a {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		988417a6808a9096745326ac1530f5c621b7fce1
		7a6ddce1d044e41ac9234e30cda62d85cbbc2a54