Commit 837ef3c3 authored by GitLab Bot's avatar GitLab Bot

Automatic merge of gitlab-org/gitlab-ce master

parents fa922be3 65f2ed1d
......@@ -340,8 +340,8 @@ package-and-qa:
- ./scripts/trigger-build omnibus
when: manual
only:
- //@gitlab-org/gitlab-ce
- //@gitlab-org/gitlab-ee
- /.+/@gitlab-org/gitlab-ce
- /.+/@gitlab-org/gitlab-ee
# Review docs base
.review-docs: &review-docs
......@@ -856,10 +856,10 @@ gitlab:assets:compile:
- public/assets/
<<: *assets-compile-cache
only:
- //@gitlab-org/gitlab-ce
- //@gitlab-org/gitlab-ee
- //@gitlab/gitlabhq
- //@gitlab/gitlab-ee
- /.+/@gitlab-org/gitlab-ce
- /.+/@gitlab-org/gitlab-ee
- /.+/@gitlab/gitlabhq
- /.+/@gitlab/gitlab-ee
tags:
- docker
- gitlab-org
......@@ -1161,7 +1161,7 @@ no_ee_check:
script:
- scripts/no-ee-check
only:
- //@gitlab-org/gitlab-ce
- /.+/@gitlab-org/gitlab-ce
# GitLab Review apps
.review-build-cng-base: &review-build-cng-base
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment