diff options
author | Rémy Coutable <remy@rymai.me> | 2016-09-29 11:29:44 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-09-29 11:29:44 +0300 |
commit | 9e7e8fd3b21714d840819078640978b99763431d (patch) | |
tree | 81064a4ce05b74c02ea3aa0f1b16486af2fbd1e2 | |
parent | b72feadc5bee5205063d00c72f7e0eee55213160 (diff) | |
parent | d91a807d6614add907798bdc4b24d8b08e17299c (diff) |
Merge branch '8-9-stable' of https://gitlab.com/gitlab-org/gitlab-ce into 8-9-stable
-rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83a906932d0..4539435c97e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -191,8 +191,12 @@ teaspoon: *exec rubocop: *exec rake scss_lint: *exec rake brakeman: *exec -rake flog: *exec -rake flay: *exec +rake flog: + <<: *exec + allow_failure: yes +rake flay: + <<: *exec + allow_failure: yes rake db:migrate:reset: *exec license_finder: *exec |