.eslintrc.yml

@@ -30,10 +30,13 @@ rules:
   no-else-return:
     - error
     - allowElseIf: true
-  import/no-cycle: warn
-  import/no-unresolved: warn
+  import/no-unresolved:
+    - error
+    - ignore:
+        # https://gitlab.com/gitlab-org/gitlab/issues/38226
+        - '^ee_component/'
   import/no-useless-path-segments: off
-  import/order: warn
+  import/order: off
   lines-between-class-members: off
   # Disabled for now, to make the plugin-vue 4.5 -> 5.0 update smoother
   vue/no-confusing-v-for-v-if: error

.gitattributes

 VERSION merge=ours
 Dangerfile gitlab-language=ruby
+*.pdf filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -84,3 +84,4 @@ jsdoc/
 .overcommit.yml
 .projections.json
 /qa/.rakeTasks
+webpack-dev-server.json

.gitlab-ci.yml

-image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33"
+image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33"
 
 stages:
   - sync
   - prepare
   - quick-test
   - test
+  - post-test
   - review-prepare
   - review
   - qa
-  - post-test
+  - post-qa
   - notification
   - pages
 
@@ -16,14 +17,14 @@ variables:
   RAILS_ENV: "test"
   NODE_ENV: "test"
   SIMPLECOV: "true"
-  GIT_DEPTH: "50"
+  GIT_DEPTH: "20"
   GIT_SUBMODULE_STRATEGY: "none"
   GET_SOURCES_ATTEMPTS: "3"
   KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/report-master.json
   FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json
   BUILD_ASSETS_IMAGE: "false"
   ES_JAVA_OPTS: "-Xms256m -Xmx256m"
-  ELASTIC_URL: "http://elastic:changeme@docker.elastic.co-elasticsearch-elasticsearch:9200"
+  ELASTIC_URL: "http://elastic:changeme@elasticsearch:9200"
 
 after_script:
   - date

.gitlab/ci/frontend.gitlab-ci.yml

@@ -13,7 +13,7 @@
     - .default-before_script
     - .assets-compile-cache
     - .only:changes-code-backstage-qa
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-git-2.22-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-19.03.1
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-graphicsmagick-1.3.33-docker-19.03.1
   stage: test
   dependencies: ["setup-test-env"]
   needs: ["setup-test-env"]
@@ -245,5 +245,9 @@ webpack-dev-server:
   variables:
     WEBPACK_MEMORY_TEST: "true"
   script:
-    - node --version
     - node --expose-gc node_modules/.bin/webpack-dev-server --config config/webpack.config.js
+  artifacts:
+    name: webpack-dev-server
+    expire_in: 31d
+    paths:
+      - webpack-dev-server.json

.gitlab/ci/global.gitlab-ci.yml

@@ -202,7 +202,7 @@
     - name: redis:alpine
 
 .use-pg10:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33"
   services:
     - name: postgres:10.9
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
@@ -213,15 +213,15 @@
     - name: postgres:9.6
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:alpine
-    - name: docker.elastic.co/elasticsearch/elasticsearch:5.6.12
+    - name: elasticsearch:5.6.12
 
 .use-pg10-ee:
-  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33"
+  image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.3-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.16-postgresql-10-graphicsmagick-1.3.33"
   services:
     - name: postgres:10.9
       command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
     - name: redis:alpine
-    - name: docker.elastic.co/elasticsearch/elasticsearch:5.6.12
+    - name: elasticsearch:5.6.12
 
 .only-ee:
   only:

.gitlab/ci/notifications.gitlab-ci.yml

 .notify:
-  image: alpine
+  image: ruby:2.6-alpine
   stage: notification
   dependencies: []
   cache: {}
   before_script:
     - apk update && apk add git curl bash
+    - source scripts/utils.sh
+    - source scripts/notifications.sh
+    - install_gitlab_gem
   variables:
-    COMMIT_NOTES_URL: "https://$CI_SERVER_HOST/$CI_PROJECT_PATH/commit/$CI_COMMIT_SHA#notes-list"
+    COMMIT_NOTES_URL: "https://${CI_SERVER_HOST}/${CI_PROJECT_PATH}/commit/${CI_COMMIT_SHA}#notes-list"
 
 schedule:package-and-qa:notify-failure:
   extends:
     - .only:variables_refs-canonical-dot-com-schedules
     - .notify
   script:
-    - 'scripts/notify-slack qa-master ":skull_and_crossbones: Scheduled QA against master failed! :skull_and_crossbones: See $CI_PIPELINE_URL. For downstream pipelines, see $COMMIT_NOTES_URL" ci_failing'
+    - 'export NOTIFICATION_MESSAGE=":skull_and_crossbones: Scheduled QA against master failed! :skull_and_crossbones: See ${CI_PIPELINE_URL}. For downstream pipelines, see ${COMMIT_NOTES_URL}"'
+    - 'notify_on_job_failure schedule:package-and-qa qa-master "${NOTIFICATION_MESSAGE}" ci_failing'
   needs: ["schedule:package-and-qa"]
-  when: on_failure
+  allow_failure: true
+  when: always

.gitlab/ci/rails.gitlab-ci.yml

@@ -92,13 +92,21 @@ setup-test-env:
     - .use-pg10
     - .only-master
 
+rspec migration pg9:
+  extends: .rspec-base-pg9
+  parallel: 4
+
+rspec migration pg9-foss:
+  extends: .rspec-base-pg9-foss
+  parallel: 4
+
 rspec unit pg9:
   extends: .rspec-base-pg9
-  parallel: 24
+  parallel: 20
 
 rspec unit pg9-foss:
   extends: .rspec-base-pg9-foss
-  parallel: 24
+  parallel: 20
 
 rspec integration pg9:
   extends: .rspec-base-pg9
@@ -140,9 +148,13 @@ rspec system pg10:
     - .only-ee
     - .use-pg10-ee
 
+rspec-ee migration pg9:
+  extends: .rspec-ee-base-pg9
+  parallel: 2
+
 rspec-ee unit pg9:
   extends: .rspec-ee-base-pg9
-  parallel: 7
+  parallel: 5
 
 rspec-ee integration pg9:
   extends: .rspec-ee-base-pg9
@@ -152,11 +164,17 @@ rspec-ee system pg9:
   extends: .rspec-ee-base-pg9
   parallel: 5
 
+rspec-ee migration pg10:
+  extends:
+    - .rspec-ee-base-pg10
+    - .only-master
+  parallel: 2
+
 rspec-ee unit pg10:
   extends:
     - .rspec-ee-base-pg10
     - .only-master
-  parallel: 7
+  parallel: 5
 
 rspec-ee integration pg10:
   extends:

.gitlab/ci/reports.gitlab-ci.yml

@@ -167,7 +167,6 @@ dependency_scanning:
           DS_ANALYZER_IMAGE_TAG \
           DS_DEFAULT_ANALYZERS \
           DS_EXCLUDED_PATHS \
-          DEP_SCAN_DISABLE_REMOTE_CHECKS \
           DS_DOCKER_CLIENT_NEGOTIATION_TIMEOUT \
           DS_PULL_ANALYZER_IMAGE_TIMEOUT \
           DS_RUN_ANALYZER_TIMEOUT \
@@ -233,9 +232,3 @@ dast:
       - gl-dast-report.json
     reports:
       dast: gl-dast-report.json
-  only:
-    variables:
-      - $GITLAB_FEATURES =~ /\bdast\b/
-  except:
-    variables:
-      - $DAST_DISABLED

.gitlab/ci/review.gitlab-ci.yml

@@ -23,8 +23,10 @@ build-qa-image:
   stage: prepare
   script:
     - '[[ ! -d "ee/" ]] || export GITLAB_EDITION="ee"'
+    - export QA_MASTER_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/gitlab-${GITLAB_EDITION}-qa:master"
     - export QA_IMAGE="${CI_REGISTRY}/${CI_PROJECT_PATH}/gitlab/gitlab-${GITLAB_EDITION}-qa:${CI_COMMIT_REF_SLUG}"
-    - time docker build --cache-from gitlab/gitlab-${GITLAB_EDITION}-qa:nightly --tag ${QA_IMAGE} --file ./qa/Dockerfile ./
+    - time docker pull "${QA_MASTER_IMAGE}"
+    - time docker build --cache-from "${QA_MASTER_IMAGE}" --tag ${QA_IMAGE} --file ./qa/Dockerfile ./
     - echo "${CI_JOB_TOKEN}" | docker login --username gitlab-ci-token --password-stdin ${CI_REGISTRY}
     - time docker push ${QA_IMAGE}
 
@@ -275,7 +277,7 @@ parallel-spec-reports:
     - .only-review
     - .only:changes-code-qa
   image: ruby:2.6-alpine
-  stage: post-test
+  stage: post-qa
   dependencies: ["review-qa-all"]
   variables:
     NEW_PARALLEL_SPECS_REPORT: qa/report-new.html

.gitlab/issue_templates/Productivity Improvement.md

+## What is the productivity problem to solve?
+
+<!--
+Please describe the productivity problem that needs to be solved backed by charts from
+https://about.gitlab.com/handbook/engineering/quality/engineering-productivity-team/#engineering-productivity-team-metrics.
+-->
+
+### Problem identification checklist
+
+- [ ] The root cause of the problem is identified.
+- [ ] The surface of the problem is as small as possible.
+
+## What are the potential solutions?
+
+<!--
+Please provide potential solutions here. Example solutions could be:
+
+- Dogfood a feature.
+- Refactor/improve some workflow code.
+- Throw more money at the problem.
+
+Please provide pros/cons and a weight estimate for each solution.
+-->
+
+- [ ] All potential solutions are listed.
+- [ ] A solution has been chosen for the first iteration: `PUT THE CHOSEN SOLUTION HERE`
+
+## Who and when will the solution be implemented?
+
+<!--
+For history reason, please list the person that will implement the solution and
+the planned milestone/date.
+-->
+
+## Verify that the solution has improved the situation
+
+<!--
+Ideally, looking at the charts from the first part, we should see an improvement
+after the implementation is merged/deployed/released.
+-->
+
+- [ ] The solution improved the situation.
+  - If yes, check this box and close the issue. Well done! :tada:
+  - Otherwise, create a new "Productivity Improvement" issue. You can re-use the description from this issue, but obviously another solution should be chosen this time.
+
+/label ~"Engineering Productivity" ~meta
+/cc @gl-quality/eng-prod

.haml-lint_todo.yml

@@ -411,6 +411,7 @@ linters:
       - 'app/views/shared/snippets/_snippet.html.haml'
       - 'app/views/shared/tokens/_scopes_list.html.haml'
       - 'app/views/shared/web_hooks/_form.html.haml'
+      - 'app/views/shared/web_hooks/_hook.html.haml'
       - 'app/views/shared/web_hooks/_test_button.html.haml'
       - 'app/views/u2f/_authenticate.html.haml'
       - 'app/views/u2f/_register.html.haml'
@@ -442,7 +443,7 @@ linters:
       - 'ee/app/views/groups/epics/_epic.html.haml'
       - 'ee/app/views/groups/group_members/_ldap_sync.html.haml'
       - 'ee/app/views/groups/group_members/_sync_button.html.haml'
-      - 'ee/app/views/groups/hooks/_project_hook.html.haml'
+      - 'ee/app/views/groups/hooks/edit.html.haml'
       - 'ee/app/views/groups/hooks/index.html.haml'
       - 'ee/app/views/groups/ldap_group_links/index.html.haml'
       - 'ee/app/views/groups/pipeline_quota/index.html.haml'

.markdownlint.json

@@ -26,5 +26,102 @@
   "first-line-h1": false,
   "code-block-style": {
     "style": "fenced"
+  },
+  "proper-names": {
+    "names": [
+      "Akismet",
+      "Alertmanager",
+      "API",
+      "Asana",
+      "Auth0",
+      "Authentiq",
+      "Azure",
+      "Bamboo",
+      "Bitbucket",
+      "Bugzilla",
+      "CAS",
+      "CentOS",
+      "Consul",
+      "Debian",
+      "Elasticsearch",
+      "Facebook",
+      "Git LFS",
+      "git-annex",
+      "Git",
+      "Gitaly",
+      "GitHub",
+      "GitLab Geo",
+      "GitLab Monitor",
+      "GitLab Operator",
+      "GitLab Pages",
+      "GitLab Rails",
+      "GitLab Runner",
+      "GitLab Shell",
+      "GitLab Workhorse",
+      "GitLab",
+      "Gmail",
+      "Google",
+      "Grafana",
+      "Helm",
+      "HipChat",
+      "Ingress",
+      "jasmine-jquery",
+      "JavaScript",
+      "Jaeger",
+      "Jenkins",
+      "Jira",
+      "Jira Cloud",
+      "Jira Server",
+      "jQuery",
+      "JupyterHub",
+      "Karma",
+      "Kerberos",
+      "Knative",
+      "Kubernetes",
+      "LDAP",
+      "Let's Encrypt",
+      "Markdown",
+      "markdownlint",
+      "Mattermost",
+      "Microsoft",
+      "MinIO",
+      "NGINX Ingress",
+      "NGINX",
+      "OAuth",
+      "OAuth 2",
+      "OmniAuth",
+      "Omnibus GitLab",
+      "OpenID",
+      "OpenShift",
+      "PgBouncer",
+      "PostgreSQL",
+      "Prometheus",
+      "Puma",
+      "Python",
+      "Redis",
+      "Redmine",
+      "reCAPTCHA",
+      "runit",
+      "Salesforce",
+      "SAML",
+      "Sentry",
+      "Sidekiq",
+      "Shibboleth",
+      "Slack",
+      "SMTP",
+      "SSH",
+      "Tiller",
+      "Trello",
+      "Trello Power-Ups",
+      "TypeScript",
+      "Twitter",
+      "Ubuntu",
+      "Ultra Auth",
+      "Unicorn",
+      "unicorn-worker-killer",
+      "WebdriverIO",
+      "YouTrack"
+    ],
+    "code_blocks": false
   }
 }

.nvmrc

-12.4.0
+12.10.0

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
 
+## 12.5.4
+
+### Security (1 change)
+
+- Fix stale Elasticsearch permissions when moving group from public group to private parent group.
+
+
+## 12.5.3
+
+### Performance (1 change)
+
+- Geo - Improve query performance to determine job artifacts to sync when selective sync is enabled. !19583
+
+### Other (1 change)
+
+- Geo - Does not schedule duplicated jobs while backfilling uploads, LFS objects and job artifacts. !20324
+
+
 ## 12.5.1
 
 ### Security (6 changes)
@@ -240,6 +258,13 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Docs for protected branch code owner approval API. !17132
 
 
+## 12.3.9
+
+### Security (1 change)
+
+- Fix stale Elasticsearch permissions when moving group from public group to private parent group.
+
+
 ## 12.3.7
 
 ### Security (6 changes)
@@ -455,6 +480,13 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Fixes style-lint errors and warnings for EE builds.scss file.
 
 
+## 12.2.11
+
+### Fixed (1 change)
+
+- Backport the new reliable fetcher. !21198
+
+
 ## 12.2.8
 
 ### Fixed (1 change)
@@ -803,6 +835,21 @@ Please view this file on the master branch, on stable branches it's out of date.
 - Don't send CI usage email notifications for self-hosted instances. !14809
 
 
+## 12.0.12
+
+### Fixed (1 change)
+
+- Backport the new reliable fetcher to 12.0.9. !20532
+
+
+## 12.0.10
+
+- No changes.
+### Fixed (1 change)
+
+- Backport the new reliable fetcher to 12.0.9. !20532
+
+
 ## 12.0.7
 
 ### Security (3 changes)

CHANGELOG.md

@@ -2,6 +2,27 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
+## 12.5.4
+
+### Security (1 change)
+
+- Update maven_file_name_regex for full string match.
+
+
+## 12.5.3
+
+### Fixed (4 changes)
+
+- Fix project creation with templates using /projects/user/:id API. !20590
+- Fix merging merge requests from push options. !20639
+- Fix Crossplane help link in cluster applications page. !20668
+- Fixes job log not scrolling to the bottom.
+
+### Changed (1 change)
+
+- Flatten exception details in API and controller logs. !20434
+
+
 ## 12.5.1
 ### Security (11 changes)
@@ -742,6 +763,13 @@ entry.
 - Remove Postgresql specific setup tasks and move to schema.rb.
+## 12.3.9
+
+### Security (1 change)
+
+- Update maven_file_name_regex for full string match.
+
+
 ## 12.3.7
 ### Security (12 changes)
@@ -1065,6 +1093,10 @@ entry.
 - Updates tooltip of 'detached' label/state.
+## 12.2.11
+
+- No changes.
+
 ## 12.2.8
 ### Security (1 change)
@@ -1779,6 +1811,15 @@ entry.
 - Removes EE differences for app/views/admin/users/show.html.haml.
+## 12.0.12
+
+- No changes.
+
+## 12.0.10
+
+- No changes.
+- No changes.
+
 ## 12.0.7
 ### Security (22 changes)

Dangerfile

@@ -5,6 +5,7 @@ require_relative 'lib/gitlab/danger/request_helper'
 
 danger.import_plugin('danger/plugins/helper.rb')
 danger.import_plugin('danger/plugins/roulette.rb')
+danger.import_plugin('danger/plugins/changelog.rb')
 
 unless helper.release_automation?
   GitlabDanger.new(helper.gitlab_helper).rule_names.each do |file|

GITALY_SERVER_VERSION

-1.72.1
+1.75.0

GITLAB_SHELL_VERSION

-10.2.0
+10.3.0

GITLAB_WORKHORSE_VERSION

-8.14.1
+8.17.0