summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-11-26 09:38:54 +0000
committerRémy Coutable <remy@rymai.me>2018-11-26 09:38:54 +0000
commitaed88cd40d44ade30f5fe6dc8b572f3ace71f74f (patch)
treedd74b8602aa994c61658e9fc5280e88f2e3668fd
parent00cbe6c9fdd942041fac22337b14d77723697733 (diff)
parentc1d14d3335803353d02ea749c7ef866d968124e2 (diff)
downloadgitlab-ce-aed88cd40d44ade30f5fe6dc8b572f3ace71f74f.tar.gz
Merge branch 'docs/exclude-qa-frontend' into 'master'
Exclude qa-frontend from running on docs-only branches See merge request gitlab-org/gitlab-ce!23327
-rw-r--r--.gitlab-ci.yml1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c6cf7475afa..2c521b03863 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -760,6 +760,7 @@ qa:selectors:
- yarn install --frozen-lockfile --cache-folder .yarn-cache
- date
- yarn run webpack-prod
+ <<: *except-docs
qa-frontend-node:6:
<<: *qa-frontend-node