Merge branch 'master' into postgres-deprecation-notice

.gitlab-ci.yml

@@ -21,6 +21,20 @@ stages:
   - aws-marketplace-release
   - notification_fail
 
+workflow:
+  rules:
+    # For branches, create a pipeline.
+    # FIXME: We should change the following to `- if: 'CI_MERGE_REQUEST_IID'`
+    - if: '$CI_COMMIT_BRANCH'
+    # For `master` branch, create a pipeline (this includes on schedules, pushes, merges, etc.).
+    - if: '$CI_COMMIT_BRANCH == "master"'
+    # For tags, create a pipeline.
+    - if: '$CI_COMMIT_TAG'
+
+default:
+  tags:
+    - gitlab-org
+
 variables:
   BUILDER_IMAGE_REGISTRY: "dev.gitlab.org:5005/cookbooks/gitlab-omnibus-builder"
   PUBLIC_BUILDER_IMAGE_REGISTRY: "registry.gitlab.com/gitlab-org/gitlab-omnibus-builder"
@@ -49,7 +63,7 @@ variables:
   services:
     - docker:19.03.0-dind
   tags:
-    - docker
+    - gitlab-org-docker
 
 ### Measure memory usage
 .measure_memory_script_artifacts: &measure_memory_script_artifacts
@@ -130,6 +144,7 @@ fetch-assets:
       - $DEPS_PIPELINE
       # Format of the auto-deploy tag
       - $CI_COMMIT_TAG =~ /^\d+\.\d+\.\d+\+[^ ]{7,}\.[^ ]{7,}$/
+      - $CI_COMMIT_REF_NAME =~ /^[0-9]+-[0-9]+-auto-deploy-[0-9]+$/
 
 include:
   - '/gitlab-ci-config/gitlab-com.yml'

.markdownlint.json

@@ -22,7 +22,6 @@
     "style": "---"
   },
   "no-emphasis-as-heading": false,
-  "fenced-code-language": false,
   "first-line-h1": false,
   "code-block-style": {
     "style": "fenced"
@@ -43,6 +42,7 @@
       "CentOS",
       "Consul",
       "Debian",
+      "DevOps",
       "Elasticsearch",
       "Facebook",
       "Git LFS",
@@ -84,7 +84,9 @@
       "markdownlint",
       "Mattermost",
       "Microsoft",
+      "Minikube",
       "MinIO",
+      "ModSecurity",
       "NGINX Ingress",
       "NGINX",
       "OAuth",
@@ -98,9 +100,11 @@
       "Prometheus",
       "Puma",
       "Python",
+      "Rake",
       "Redis",
       "Redmine",
       "reCAPTCHA",
+      "Ruby",
       "runit",
       "Salesforce",
       "SAML",

CHANGELOG.md

@@ -3,6 +3,27 @@
 The latest version of this file can be found at the master branch of the
 omnibus-gitlab repository.
 
+## 12.9.4 (2020-04-16)
+
+### Other (1 change)
+
+- Upgrade to Git 2.24.2.
+
+
+## 12.9.4 (2020-04-17)
+
+### Other (1 change)
+
+- Upgrade to Git 2.24.2.
+
+
+## 12.9.3 (2020-04-14)
+
+### Fixed (1 change)
+
+- Upgrade to OpenSSL v1.1.1f. !4087
+
+
 ## 12.9.2 (2020-03-31)
 
 ### Fixed (1 change)
@@ -64,6 +85,13 @@ omnibus-gitlab repository.
 - Update Mattermost to 5.20.1.
 
 
+## 12.8.9 (2020-04-14)
+
+### Fixed (1 change)
+
+- Upgrade to OpenSSL v1.1.1f. !4088
+
+
 ## 12.8.7 (2020-03-16)
 
 - No changes.
@@ -139,6 +167,13 @@ omnibus-gitlab repository.
 - Update Mattermost to 5.18.1.
 
 
+## 12.7.9 (2020-04-14)
+
+### Fixed (1 change)
+
+- Upgrade to OpenSSL v1.1.1f. !4089
+
+
 ## 12.7.8 (2020-03-26)
 
 ### Security (1 change)

changelogs/unreleased/4571-fix-username-setting-of-services.yml

+---
+title: Deprecate user attributes of consul and repmgr in favor of username
+merge_request: 3489
+author:
+type: deprecated

changelogs/unreleased/bump-registry-version-v2-9-0-gitlab.yml

+---
+title: Bump Container Registry to v2.9.0-gitlab
+merge_request: 4071
+author:
+type: changed

changelogs/unreleased/cc-git-2-26-0.yml

+---
+title: Upgrade to Git 2.26.0
+merge_request: 4039
+author:
+type: other

changelogs/unreleased/configure-cable-yml.yml

+---
+title: Generate ActionCable configuration file
+merge_request: 4066
+author:
+type: added

changelogs/unreleased/delete-ami-deletion-cruft.yml

+---
+title: Build AMIs for all tags except RC and auto-deploy ones
+merge_request: 4036
+author:
+type: other

changelogs/unreleased/deps-69b928e-2cc4d17.yml

+---
+title: Update gitlab-exporter from 6.1.0 to 7.0.1
+merge_request: 4065
+author:
+type: other

changelogs/unreleased/deps-daa24eb-9910470.yml

+---
+title: Update logrotate version to 3.16.0
+merge_request: 3961
+author:
+type: other

changelogs/unreleased/fix-pg-upgrade-error-message.yml

+---
+title: Fix pg-upgrade error format exception
+merge_request: 4090
+author:
+type: fixed

changelogs/unreleased/fix-repmgr-pg-upgrade.yml

+---
+title: Fix repmgr failure during pg-upgrade
+merge_request: 4117
+author:
+type: fixed

changelogs/unreleased/fix-sysctl-pg-upgrade.yml

+---
+title: Fix pg-upgrade error during sysctl commands
+merge_request: 4080
+author:
+type: fixed

changelogs/unreleased/fix-tracking-db-upgrade.yml

+---
+title: Fixed pg upgrade for seperate geo tracking db
+merge_request: 4091
+author:
+type: fixed

changelogs/unreleased/fixes-sysctl-error-on-reconfigure-after-reinstall.yml

+---
+title: Fixes sysctl error on reconfigure after reinstall
+merge_request: 3921
+author:
+type: fixed

changelogs/unreleased/git-2-26-1.yml

+---
+title: Upgrade to Git 2.26.1
+merge_request:
+author:
+type: other

changelogs/unreleased/gitlab-redis-cli.yml

+---
+title: Introduce gitlab-redis-cli
+merge_request: 4020
+author:
+type: added

changelogs/unreleased/mattermost-5-21.yml

+---
+title: Upgrade Mattermost to 5.21.0
+merge_request:
+author:
+type: other

changelogs/unreleased/pg-11-fresh-installs.yml

+---
+title: Default to PG 11 for fresh installs
+merge_request: 4099
+author:
+type: changed

changelogs/unreleased/pokstad1-add-praefect-dashboards.yml

+---
+title: Update Grafana to include Praefect dashboards
+merge_request: 4084
+author:
+type: added