Commit 3c11e5b5 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents 4919c0e6 f3f02f56
...@@ -855,7 +855,6 @@ gitlab:assets:compile: ...@@ -855,7 +855,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: []
...@@ -876,6 +875,7 @@ gitlab:ui:visual: ...@@ -876,6 +875,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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment