Add latest changes from gitlab-org/gitlab@master

4 files changed, 34 insertions, 7 deletions

diff --git a/.gitlab/CODEOWNERS b/.gitlab/CODEOWNERS
index 0f2dd081e9e..7ed75125391 100644
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -6,8 +6,8 @@
 /doc/ @axil @marcia @eread @mikelewis
 
 # Frontend maintainers should see everything in `app/assets/`
-app/assets/ @ClemMakesApps @fatihacet @filipa @mikegreiling @timzallmann @kushalpandya @pslaughter
-*.scss @annabeldunstone @ClemMakesApps @fatihacet @filipa @mikegreiling @timzallmann @kushalpandya @pslaughter
+app/assets/ @ClemMakesApps @fatihacet @filipa @mikegreiling @timzallmann @kushalpandya @pslaughter @wortschi
+*.scss @annabeldunstone @ClemMakesApps @fatihacet @filipa @mikegreiling @timzallmann @kushalpandya @pslaughter @wortschi
 
 # Database maintainers should review changes in `db/`
 db/ @gitlab-org/maintainers/database
diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml
index e0ce6e2fde2..e082d584b0c 100644
--- a/.gitlab/ci/global.gitlab-ci.yml
+++ b/.gitlab/ci/global.gitlab-ci.yml
@@ -110,6 +110,12 @@
       - $CI_SERVER_HOST == "gitlab.com" && $CI_PROJECT_NAMESPACE == "gitlab-org"
     kubernetes: active
 
+.only-canonical-schedules:
+  only:
+    refs:
+      - schedules@gitlab-org/gitlab
+      - schedules@gitlab-org/gitlab-foss
+
 .use-pg9:
   services:
     - name: postgres:9.6
diff --git a/.gitlab/ci/notifications.gitlab-ci.yml b/.gitlab/ci/notifications.gitlab-ci.yml
new file mode 100644
index 00000000000..e4ffceb2dc0
--- /dev/null
+++ b/.gitlab/ci/notifications.gitlab-ci.yml
@@ -0,0 +1,25 @@
+.notify:
+  image: alpine
+  stage: notification
+  dependencies: []
+  cache: {}
+  before_script:
+    - apk update && apk add git curl bash
+
+schedule:package-and-qa:notify-success:
+  extends:
+    - .only-canonical-schedules
+    - .notify
+  script:
+    - 'scripts/notify-slack qa-master ":tada: Scheduled QA against `master` passed! :tada: See $CI_PIPELINE_URL." ci_passing'
+  needs: ["schedule:package-and-qa"]
+  when: on_success
+
+schedule:package-and-qa:notify-failure:
+  extends:
+    - .only-canonical-schedules
+    - .notify
+  script:
+    - 'scripts/notify-slack qa-master ":skull_and_crossbones: Scheduled QA against `master` failed! :skull_and_crossbones: See $CI_PIPELINE_URL." ci_failing'
+  needs: ["schedule:package-and-qa"]
+  when: on_failure
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml
index ce34cfb39a8..1048dd02cd8 100644
--- a/.gitlab/ci/qa.gitlab-ci.yml
+++ b/.gitlab/ci/qa.gitlab-ci.yml
@@ -38,9 +38,5 @@ schedule:package-and-qa:
   extends:
     - .package-and-qa-base
     - .only-code-qa-changes
-  only:
-    refs:
-      - schedules@gitlab-org/gitlab
-      - schedules@gitlab-org/gitlab-foss
+    - .only-canonical-schedules
   needs: ["build-qa-image", "gitlab:assets:compile"]
-  allow_failure: true