Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
16a291caca32
Commit
38188eda
authored
Dec 05, 2018
by
Marin Jankovski
Browse files
Merge branch 'remove-merge-master' into 'master'
Remove merge:master job entirely See merge request gitlab-org/gitlab-ce!23585
parents
97c9190fde8c
8751dc5e085e
Changes
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
16a291ca
...
@@ -1053,27 +1053,3 @@ schedule:review-cleanup:
...
@@ -1053,27 +1053,3 @@ schedule:review-cleanup:
-
gem install gitlab --no-document
-
gem install gitlab --no-document
script
:
script
:
-
ruby -rrubygems scripts/review_apps/automated_cleanup.rb
-
ruby -rrubygems scripts/review_apps/automated_cleanup.rb
merge:master:
image
:
registry.gitlab.com/gitlab-org/merge-train
stage
:
merge
# The global before_script/after_script blocks break this job, or aren't
# necessary. These two lines result in them being ignored.
before_script
:
[]
after_script
:
[]
only
:
refs
:
-
master
-
schedules
variables
:
-
$CI_PROJECT_PATH == "gitlab-org/gitlab-ce"
-
$MERGE_TRAIN_SSH_PUBLIC_KEY
-
$MERGE_TRAIN_SSH_PRIVATE_KEY
-
$MERGE_TRAIN_API_TOKEN
-
$MERGE_FORCE_ENABLE
script
:
-
scripts/merge-train
cache
:
paths
:
-
gitlab-ee
key
:
"
merge:master"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment