From b4b0aa2183ac58f15b85ca4b3a8b9508fa2a33ca Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axil@gitlab.com>
Date: Tue, 15 Jan 2019 14:38:11 +0100
Subject: Use merge_requests in a separate only/except item

Otherwise, only the jobs that have merge_requests defined
will run.
---
 .gitlab-ci.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6f09b508d3..d4ccbecdbb5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -271,8 +271,9 @@ review-docs-deploy-manual:
     - ./$SCRIPT_NAME deploy
   when: manual
   only:
-    - merge_requests@gitlab-org/gitlab-ce
-    - merge_requests@gitlab-org/gitlab-ee
+    - branches@gitlab-org/gitlab-ce
+    - branches@gitlab-org/gitlab-ee
+    - merge_requests
   <<: *except-docs-and-qa
 
 # Always trigger a docs build in gitlab-docs only on docs-only branches.
@@ -285,8 +286,9 @@ review-docs-deploy:
     - ./$SCRIPT_NAME deploy
   only:
     refs:
-      - merge_requests@gitlab-org/gitlab-ce
-      - merge_requests@gitlab-org/gitlab-ee
+      - branches@gitlab-org/gitlab-ce
+      - branches@gitlab-org/gitlab-ee
+      - merge_requests
     variables:
       - $CI_COMMIT_REF_NAME =~ /(^docs[\/-].*|.*-docs$)/
   <<: *except-qa
@@ -303,8 +305,9 @@ review-docs-cleanup:
     - ./$SCRIPT_NAME cleanup
   when: manual
   only:
-    - merge_requests@gitlab-org/gitlab-ce
-    - merge_requests@gitlab-org/gitlab-ee
+    - branches@gitlab-org/gitlab-ce
+    - branches@gitlab-org/gitlab-ee
+    - merge_requests
 
 ##
 # Trigger a docker image build in CNG (Cloud Native GitLab) repository
-- 
cgit v1.2.1