Merge branch 'sh-allow-flay-flog-failure' into 'master'

Allow flay and flog to fail for now flay and flog started working somehow (despite #17858). Disabling them for now since the broken builds are impeding progress. See merge request !6360

Merge branch 'sh-allow-flay-flog-failure' into 'master'
0a8b6630 · Stan Hu · 5c8f0065 · d22918a1 · 0a8b6630
Commit 0a8b6630 authored Sep 15, 2016 by Stan Hu
Hide 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
@@ -209,8 +209,12 @@ rubocop: *exec
 rake haml_lint: *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
 license_finder: *exec
 rake downtime_check: *exec