summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-11-22 16:18:22 +0000
committerRémy Coutable <remy@rymai.me>2018-11-22 16:18:22 +0000
commit27e35703482e4d0f137d013f940eab6a6eec49f8 (patch)
tree2fb84d840ff33c5d43a673f3b5753e04d89c6533
parentba9eeea4ee2eb3a43cc3d107a2590a6227af89ed (diff)
parent8ed21de40398e544b4ab73e9b6cec2dc6e285053 (diff)
downloadgitlab-ce-27e35703482e4d0f137d013f940eab6a6eec49f8.tar.gz
Merge branch 'gt-include-wildcard-for-gitlab-assets-compile-only-parameter' into 'master'
Include wildcard for `gitlab:assets:compile` only parameter See merge request gitlab-org/gitlab-ce!23305
-rw-r--r--.gitlab-ci.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 617c5c084b7..c6cf7475afa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -620,10 +620,10 @@ gitlab:assets:compile:
- webpack-report/
- public/assets/
only:
- - branches@gitlab-org/gitlab-ce
- - branches@gitlab-org/gitlab-ee
- - tags@gitlab-org/gitlab-ce
- - tags@gitlab-org/gitlab-ee
+ - //@gitlab-org/gitlab-ce
+ - //@gitlab-org/gitlab-ee
+ - //@gitlab/gitabhq
+ - //@gitlab/gitlab-ee
tags:
- gitlab-org-delivery
- high-cpu