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

af851cbb · Rémy Coutable · 38b04f5e · bd2d9069 · af851cbb
Commit af851cbb 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
@@ -201,8 +201,12 @@ spinach 9 10 ruby23: *spinach-knapsack-ruby23
 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
 license_finder: *exec
 rake downtime_check: *exec