summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-09-03 08:39:40 +0000
committerRémy Coutable <remy@rymai.me>2018-09-03 08:39:40 +0000
commitde4c76bb0f76f67e29702c9c62b13e4178d68ae5 (patch)
tree303493abb8944d92b2b534007d81c970926ff888
parentc0fa576e45166a18973e06ee13b9cc0ed272f022 (diff)
parentcb7d4340d06e687fd65a4922841f4fb2712b0eee (diff)
downloadgitlab-ce-de4c76bb0f76f67e29702c9c62b13e4178d68ae5.tar.gz
Merge branch '50936-docs/run-review-cleanup-only-for-gitlab-org-repos' into 'master'
Run the review-docs-cleanup jobs for gitlab-org repos only Closes #50936 See merge request gitlab-org/gitlab-ce!21463
-rw-r--r--.gitlab-ci.yml5
-rw-r--r--changelogs/unreleased/50936-docs-run-review-cleanup-only-for-gitlab-org-repos.yml5
2 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23d71675ae4..db1ce3e9054 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -311,10 +311,13 @@ review-docs-cleanup:
environment:
name: review-docs/$CI_COMMIT_REF_SLUG
action: stop
- when: manual
script:
- gem install gitlab --no-ri --no-rdoc
- ./$SCRIPT_NAME cleanup
+ when: manual
+ only:
+ - branches@gitlab-org/gitlab-ce
+ - branches@gitlab-org/gitlab-ee
##
# Trigger a docker image build in CNG (Cloud Native GitLab) repository
diff --git a/changelogs/unreleased/50936-docs-run-review-cleanup-only-for-gitlab-org-repos.yml b/changelogs/unreleased/50936-docs-run-review-cleanup-only-for-gitlab-org-repos.yml
new file mode 100644
index 00000000000..87265506e24
--- /dev/null
+++ b/changelogs/unreleased/50936-docs-run-review-cleanup-only-for-gitlab-org-repos.yml
@@ -0,0 +1,5 @@
+---
+title: Run review-docs-cleanup job for gitlab-org repos only
+merge_request: 21463
+author: Takuya Noguchi
+type: other