diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-10-07 18:21:51 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-13 18:42:06 +0300 |
| commit | 2650d5f895c6f7e56f7ba76e5fa448d38fd15d7c (patch) | |
| tree | 2e39f021e5113ccf3b58ce0426457c45572b236e /.gitlab-ci.yml | |
| parent | 069f2d347585a0f79ab8e3ddfb194ebbc86176c3 (diff) | |
Improve the branch existence and merge checks
Also add a safeguard for non-CI env.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |