diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2019-03-08 12:19:49 +0000 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2019-03-08 12:19:49 +0000 |
| commit | 96a94b74663f6f22778824f4c446ecf766f5a52f (patch) | |
| tree | b1f50a0e7100df09d1d134d6286cbfc3ba3ce9f3 | |
| parent | d222ab00a0a92a148b2798f89c5ac143c8a8d9cb (diff) | |
| download | gitlab-ce-winh-catch-docs-and-master-test-docs.tar.gz | |
Inline except-docs-and-master in gitlab:ui:visual jobwinh-catch-docs-and-master-test-docs
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5b466100584..bd29a266ccd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,11 +93,6 @@ stages: - /(^docs[\/-].*|.*-docs$)/ - /(^qa[\/-].*|.*-qa$)/ -.except-docs-and-master: &except-docs-and-master - except: - - /(^docs[\/-].*|.*-docs$)/ - - master - # Jobs that only need to pull cache .dedicated-no-docs-pull-cache-job: &dedicated-no-docs-pull-cache-job <<: *dedicated-runner @@ -689,7 +684,6 @@ gitlab:assets:compile: - gitlab-org gitlab:ui:visual: - <<: *except-docs-and-master tags: - gitlab-org before_script: [] @@ -709,6 +703,9 @@ gitlab:ui:visual: - app/assets/stylesheets/**/*.scss - app/assets/stylesheets/**/**/*.scss except: + refs: + - /(^docs[\/-].*|.*-docs$)/ + - master variables: - $CI_COMMIT_MESSAGE =~ /\[skip visual\]/i artifacts: |