From 27cd58f0340a43305d2b8c8725a2a5dd13840890 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Tue, 20 Aug 2019 14:29:03 +0200
Subject: [PATCH] Add explicit merge_request dependency on CI

Else GitLab CI has a hard time doing the things you'd expect, example:
now it couldn't run a pipeline on the merged result before merging.
This limits the merge requests that are created before an MR is created,
which will probably take some time to get used to.
---
 .gitlab-ci.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c12efb36811..c4034dd1d63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,10 +13,10 @@ danger-review:
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger
   stage: build
   only:
-    - branches@gitlab-org/gitaly
+    - merge_requests
   except:
     - tags
-    - master
+    - branches
   script:
     - git version
     - danger
@@ -26,6 +26,10 @@ danger-review:
     key: gems-ruby-2.6
     paths:
       - ruby/vendor/bundle
+  only:
+    - merge_requests
+    - tags
+    - master
 
 .build_template: &build_definition
   <<: *ruby_definition
@@ -69,6 +73,10 @@ danger-review:
 
 .test_template: &test_definition
   <<: *go_test_definition
+  only:
+    - merge_requests
+    - tags
+    - master
   script:
     - go version
     - git version
@@ -128,7 +136,7 @@ race:
     - make race-go
 
 cover:
-  <<: *ruby_definition
+  <<: *go_test_definition
   stage: test
   script:
     - make cover
-- 
GitLab