summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-03-08 14:47:43 +0000
committerPhil Hughes <me@iamphill.com>2019-03-08 14:47:43 +0000
commitf3f02f56f05895d40aba887b145b267778d19f69 (patch)
tree202b747593ac0a7b9c654959b3ef8f575e27b70e
parent26477f388952f9b8d02fcca6ac4395915e48218c (diff)
parent21ba1138153a51771f607c183dd37cc3412368e4 (diff)
downloadgitlab-ce-f3f02f56f05895d40aba887b145b267778d19f69.tar.gz
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
-rw-r--r--.gitlab-ci.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26087b2cc4d..bd29a266ccd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -684,7 +684,6 @@ gitlab:assets:compile:
- gitlab-org
gitlab:ui:visual:
- <<: *except-docs
tags:
- gitlab-org
before_script: []
@@ -705,6 +704,7 @@ gitlab:ui:visual:
- app/assets/stylesheets/**/**/*.scss
except:
refs:
+ - /(^docs[\/-].*|.*-docs$)/
- master
variables:
- $CI_COMMIT_MESSAGE =~ /\[skip visual\]/i