summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-09-29 19:31:14 +0200
committerRémy Coutable <remy@rymai.me>2016-10-13 17:42:05 +0200
commit069f2d347585a0f79ab8e3ddfb194ebbc86176c3 (patch)
tree807bcfc4070ae032f6665a4010ff24fcf5986864 /.gitlab-ci.yml
parent8776d9a365f793b4af79cb803d43f09ae9088803 (diff)
downloadgitlab-ce-069f2d347585a0f79ab8e3ddfb194ebbc86176c3.tar.gz
Draft a quick CE->EE merge check rake task
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d19f55aca3..7e2d705a888 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -210,6 +210,13 @@ rake brakeman: *exec
rake flay: *exec
license_finder: *exec
rake downtime_check: *exec
+rake ce_to_ee_merge_check:
+ <<: *exec
+ only:
+ - branches
+ except:
+ - tags
+ - master
rake db:migrate:reset:
stage: test