Merge branch 'ce-to-ee-2018-11-14' into 'master'

CE upstream - 2018-11-14 22:21 UTC

Closes gitlab-ce#54059

See merge request gitlab-org/gitlab-ee!8458

.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: