From 2650d5f895c6f7e56f7ba76e5fa448d38fd15d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 7 Oct 2016 17:21:51 +0200
Subject: Improve the branch existence and merge checks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also add a safeguard for non-CI env.

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e2d705a888..8708eae1b2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -216,7 +216,7 @@ rake ce_to_ee_merge_check:
     - branches
   except:
     - tags
-    - master
+  allow_failure: yes
 
 rake db:migrate:reset:
   stage: test
-- 
cgit v1.2.3