Add latest changes from gitlab-org/gitlab@master

10 files changed, 46 insertions, 46 deletions

diff --git a/.gitlab/ci/cng.gitlab-ci.yml b/.gitlab/ci/cng.gitlab-ci.yml
index a43d3694103..3ba3b221df0 100644
--- a/.gitlab/ci/cng.gitlab-ci.yml
+++ b/.gitlab/ci/cng.gitlab-ci.yml
@@ -11,5 +11,5 @@ cloud-native-image:
     - CNG_PROJECT_PATH="gitlab-org/build/CNG" BUILD_TRIGGER_TOKEN=$CI_JOB_TOKEN ./scripts/trigger-build cng
   only:
     refs:
-      - tags@gitlab-org/gitlab-ce
-      - tags@gitlab-org/gitlab-ee
+      - tags@gitlab-org/gitlab-foss
+      - tags@gitlab-org/gitlab
diff --git a/.gitlab/ci/docs.gitlab-ci.yml b/.gitlab/ci/docs.gitlab-ci.yml
index 3f29adddf73..22e752ae0b0 100644
--- a/.gitlab/ci/docs.gitlab-ci.yml
+++ b/.gitlab/ci/docs.gitlab-ci.yml
@@ -10,7 +10,7 @@
   environment:
     name: review-docs/$CI_COMMIT_REF_SLUG
     # DOCS_REVIEW_APPS_DOMAIN and DOCS_GITLAB_REPO_SUFFIX are CI variables
-    # Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14236/diffs#note_40140693
+    # Discussion: https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/14236/diffs#note_40140693
     url: http://$CI_ENVIRONMENT_SLUG.$DOCS_REVIEW_APPS_DOMAIN/$DOCS_GITLAB_REPO_SUFFIX
     on_stop: review-docs-cleanup
   before_script:
@@ -31,8 +31,8 @@ review-docs-deploy-manual:
     - ./trigger-build-docs deploy
   when: manual
   only:
-    - branches@gitlab-org/gitlab-ce
-    - branches@gitlab-org/gitlab-ee
+    - branches@gitlab-org/gitlab-foss
+    - branches@gitlab-org/gitlab
 
 # Always trigger a docs build in gitlab-docs only on docs-only branches.
 # Useful to preview the docs changes live.
@@ -44,8 +44,8 @@ review-docs-deploy:
     - gem install gitlab --no-document
     - ./trigger-build-docs deploy
   only:
-    - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab-ce
-    - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab-ee
+    - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab-foss
+    - /(^docs[\/-].+|.+-docs$)/@gitlab-org/gitlab
 
 # Cleanup remote environment of gitlab-docs
 review-docs-cleanup:
@@ -60,8 +60,8 @@ review-docs-cleanup:
     - ./trigger-build-docs cleanup
   when: manual
   only:
-    - branches@gitlab-org/gitlab-ce
-    - branches@gitlab-org/gitlab-ee
+    - branches@gitlab-org/gitlab-foss
+    - branches@gitlab-org/gitlab
 
 docs lint:
   extends:
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml
index b2058506ea1..a61601597c3 100644
--- a/.gitlab/ci/frontend.gitlab-ci.yml
+++ b/.gitlab/ci/frontend.gitlab-ci.yml
@@ -45,8 +45,8 @@
     - scripts/clean-old-cached-assets
     - rm -f /etc/apt/sources.list.d/google*.list  # We don't need to update Chrome here
   only:
-    - /.+/@gitlab-org/gitlab-ce
-    - /.+/@gitlab-org/gitlab-ee
+    - /.+/@gitlab-org/gitlab-foss
+    - /.+/@gitlab-org/gitlab
     - /.+/@gitlab/gitlabhq
     - /.+/@gitlab/gitlab-ee
   tags:
@@ -57,8 +57,8 @@ gitlab:assets:compile:
   extends: .gitlab:assets:compile-metadata
   only:
     refs:
-      - master@gitlab-org/gitlab-ce
-      - master@gitlab-org/gitlab-ee
+      - master@gitlab-org/gitlab-foss
+      - master@gitlab-org/gitlab
   cache:
     policy: pull-push
 
@@ -66,8 +66,8 @@ gitlab:assets:compile pull-cache:
   extends: .gitlab:assets:compile-metadata
   except:
     refs:
-      - master@gitlab-org/gitlab-ce
-      - master@gitlab-org/gitlab-ee
+      - master@gitlab-org/gitlab-foss
+      - master@gitlab-org/gitlab
       - /(^docs[\/-].+|.+-docs$)/
   cache:
     policy: pull
@@ -102,8 +102,8 @@ compile-assets:
     - .compile-assets-metadata
   only:
     refs:
-      - master@gitlab-org/gitlab-ce
-      - master@gitlab-org/gitlab-ee
+      - master@gitlab-org/gitlab-foss
+      - master@gitlab-org/gitlab
   cache:
     policy: pull-push
 
@@ -111,8 +111,8 @@ compile-assets pull-cache:
   extends: .compile-assets-metadata
   except:
     refs:
-      - master@gitlab-org/gitlab-ce
-      - master@gitlab-org/gitlab-ee
+      - master@gitlab-org/gitlab-foss
+      - master@gitlab-org/gitlab
       - /(^docs[\/-].+|.+-docs$)/
   cache:
     policy: pull
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index 04135447ca4..8287390c80e 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -53,8 +53,8 @@
 .review-only:
   only:
     refs:
-      - branches@gitlab-org/gitlab-ce
-      - branches@gitlab-org/gitlab-ee
+      - branches@gitlab-org/gitlab-foss
+      - branches@gitlab-org/gitlab
     kubernetes: active
   except:
     refs:
diff --git a/.gitlab/ci/pages.gitlab-ci.yml b/.gitlab/ci/pages.gitlab-ci.yml
index 2de09753cca..cf77ec24090 100644
--- a/.gitlab/ci/pages.gitlab-ci.yml
+++ b/.gitlab/ci/pages.gitlab-ci.yml
@@ -6,8 +6,8 @@ pages:
     - .except-docs
   only:
     refs:
-      - master@gitlab-org/gitlab-ce
-      - master@gitlab-org/gitlab-ee
+      - master@gitlab-org/gitlab-foss
+      - master@gitlab-org/gitlab
   stage: pages
   dependencies: ["coverage", "karma", "gitlab:assets:compile"]
   script:
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index ca89c4e2c89..a868316c353 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -11,8 +11,8 @@
     - ./scripts/trigger-build omnibus
   only:
     refs:
-      - branches@gitlab-org/gitlab-ce
-      - branches@gitlab-org/gitlab-ee
+      - branches@gitlab-org/gitlab-foss
+      - branches@gitlab-org/gitlab
 
 package-and-qa-manual:
   extends: .package-and-qa-base
@@ -28,8 +28,8 @@ package-and-qa-manual:master:
   extends: .package-and-qa-base
   only:
     refs:
-      - master@gitlab-org/gitlab-ce
-      - master@gitlab-org/gitlab-ee
+      - master@gitlab-org/gitlab-foss
+      - master@gitlab-org/gitlab
   when: manual
   needs: ["build-qa-image", "gitlab:assets:compile"]
 
@@ -37,7 +37,7 @@ package-and-qa:
   extends: .package-and-qa-base
   only:
     refs:
-      - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ce
-      - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-ee
+      - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab-foss
+      - /(^qa[\/-].*|.*-qa$)/@gitlab-org/gitlab
   needs: ["build-qa-image", "gitlab:assets:compile pull-cache"]
   allow_failure: true
diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml
index a1ed0b102c9..2363c0e5f8a 100644
--- a/.gitlab/ci/rails.gitlab-ci.yml
+++ b/.gitlab/ci/rails.gitlab-ci.yml
@@ -1,17 +1,17 @@
 .only-schedules-master:
   only:
     refs:
-      - schedules@gitlab-org/gitlab-ce
-      - schedules@gitlab-org/gitlab-ee
-      - master@gitlab-org/gitlab-ce
-      - master@gitlab-org/gitlab-ee
+      - schedules@gitlab-org/gitlab-foss
+      - schedules@gitlab-org/gitlab
+      - master@gitlab-org/gitlab-foss
+      - master@gitlab-org/gitlab
       - master@gitlab/gitlabhq
       - master@gitlab/gitlab-ee
 
 .only-gitlab-ee:
   only:
-    - branches@gitlab-org/gitlab-ee
-    - tags@gitlab-org/gitlab-ee
+    - branches@gitlab-org/gitlab
+    - tags@gitlab-org/gitlab
 
 .rake-exec:
   extends:
@@ -181,7 +181,7 @@ ee_compat_check:
     refs:
       - master
       - tags
-      - branches@gitlab-org/gitlab-ee
+      - branches@gitlab-org/gitlab
       - branches@gitlab/gitlab-ee
       - /^[\d-]+-stable(-ee)?$/
       - /(^docs[\/-].+|.+-docs$)/
@@ -236,7 +236,7 @@ db:migrate-from-v11.11.0:
   variables:
     SETUP_DB: "false"
   script:
-    - git fetch https://gitlab.com/gitlab-org/gitlab-ee.git v11.11.0-ee
+    - git fetch https://gitlab.com/gitlab-org/gitlab.git v11.11.0-ee
     - git checkout -f FETCH_HEAD
     - sed -i "s/gem 'oj', '~> 2.17.4'//" Gemfile
     - sed -i "s/gem 'bootsnap', '~> 1.0.0'/gem 'bootsnap'/" Gemfile
diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml
index 5db194e06f7..a269e15611f 100644
--- a/.gitlab/ci/review.gitlab-ci.yml
+++ b/.gitlab/ci/review.gitlab-ci.yml
@@ -1,8 +1,8 @@
 .review-schedules-only:
   only:
     refs:
-      - schedules@gitlab-org/gitlab-ce
-      - schedules@gitlab-org/gitlab-ee
+      - schedules@gitlab-org/gitlab-foss
+      - schedules@gitlab-org/gitlab
     kubernetes: active
     variables:
       - $REVIEW_APP_CLEANUP
@@ -43,8 +43,8 @@ build-qa-image:
     - .except-docs
   only:
     refs:
-      - branches@gitlab-org/gitlab-ce
-      - branches@gitlab-org/gitlab-ee
+      - branches@gitlab-org/gitlab-foss
+      - branches@gitlab-org/gitlab
   stage: test
   script:
     - time docker build --cache-from ${LATEST_QA_IMAGE} --tag ${QA_IMAGE} --file ./qa/Dockerfile ./
diff --git a/.gitlab/ci/setup.gitlab-ci.yml b/.gitlab/ci/setup.gitlab-ci.yml
index cd7ca4d30bf..d29907b3683 100644
--- a/.gitlab/ci/setup.gitlab-ci.yml
+++ b/.gitlab/ci/setup.gitlab-ci.yml
@@ -19,8 +19,8 @@ cache gems:
       - vendor/cache
   only:
     refs:
-      - master@gitlab-org/gitlab-ce
-      - master@gitlab-org/gitlab-ee
+      - master@gitlab-org/gitlab-foss
+      - master@gitlab-org/gitlab
       - tags
 
 .minimal-job:
@@ -41,4 +41,4 @@ no_ee_check:
     - scripts/no-ee-check
   only:
     refs:
-      - branches@gitlab-org/gitlab-ce
+      - branches@gitlab-org/gitlab-foss
diff --git a/.gitlab/ci/test-metadata.gitlab-ci.yml b/.gitlab/ci/test-metadata.gitlab-ci.yml
index a04f67e4c43..14c230deb47 100644
--- a/.gitlab/ci/test-metadata.gitlab-ci.yml
+++ b/.gitlab/ci/test-metadata.gitlab-ci.yml
@@ -54,8 +54,8 @@ update-tests-metadata:
     - scripts/insert-rspec-profiling-data
   only:
     refs:
-      - master@gitlab-org/gitlab-ce
-      - master@gitlab-org/gitlab-ee
+      - master@gitlab-org/gitlab-foss
+      - master@gitlab-org/gitlab
       - master@gitlab/gitlabhq
       - master@gitlab/gitlab-ee