Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-14

5f290d24 · GitLab Bot · 03fd0591 · 77b3a8b1 · 5f290d24
Commit 5f290d24 authored Nov 14, 2018 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

.gitlab-ci.yml .gitlab-ci.yml +2 -0

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,6 +110,8 @@ stages:
  allow_failure: false
  except:
    variables:
+      - $CI_COMMIT_REF_NAME =~ /(^docs[\/-].*|.*-docs$)/
+      - $CI_COMMIT_REF_NAME =~ /(^qa[\/-].*|.*-qa$)/
      - $CI_COMMIT_REF_NAME =~ /norails4/
      - $RAILS5_DISABLED
  variables: