Merge branch '8-9-stable' of https://gitlab.com/gitlab-org/gitlab-ce into 8-9-stable

9e7e8fd3 · Rémy Coutable · b72feadc · d91a807d · 9e7e8fd3
Commit 9e7e8fd3 authored Sep 29, 2016 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

.gitlab-ci.yml .gitlab-ci.yml +6 -2

No files found.
--- 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 flog:
-rake flay: *exec
+  <<: *exec
+  allow_failure: yes
+rake flay:
+  <<: *exec
+  allow_failure: yes
 rake db:migrate:reset: *exec
 license_finder: *exec