Merge branch 'winh-catch-docs-and-master' into 'master'

Skip gitlab:ui:visual job for docs again

See merge request gitlab-org/gitlab-ce!25922
This commit is contained in:
Phil Hughes 2019-03-08 14:47:43 +00:00
commit f3f02f56f0

View file

@ -684,7 +684,6 @@ gitlab:assets:compile:
- gitlab-org - gitlab-org
gitlab:ui:visual: gitlab:ui:visual:
<<: *except-docs
tags: tags:
- gitlab-org - gitlab-org
before_script: [] before_script: []
@ -705,6 +704,7 @@ gitlab:ui:visual:
- app/assets/stylesheets/**/**/*.scss - app/assets/stylesheets/**/**/*.scss
except: except:
refs: refs:
- /(^docs[\/-].*|.*-docs$)/
- master - master
variables: variables:
- $CI_COMMIT_MESSAGE =~ /\[skip visual\]/i - $CI_COMMIT_MESSAGE =~ /\[skip visual\]/i