diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 15:06:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 15:06:34 +0000 |
| commit | f1a5755898e865428c923587402fd965b601c4ea (patch) | |
| tree | a93aab01a1d3ba0e93c0fbf1450babfe4674f9dc /scripts | |
| parent | 1ae627c65192ae1a01fdac253065ef561a9d6b7e (diff) | |
| download | gitlab-ce-f1a5755898e865428c923587402fd965b601c4ea.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/review_apps/automated_cleanup.rb | 3 | ||||
| -rwxr-xr-x | scripts/trigger-build | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/review_apps/automated_cleanup.rb b/scripts/review_apps/automated_cleanup.rb index 4166070f7cd..9edc1a2b857 100755 --- a/scripts/review_apps/automated_cleanup.rb +++ b/scripts/review_apps/automated_cleanup.rb @@ -18,7 +18,8 @@ class AutomatedCleanup ].freeze def self.ee? - ENV['CI_PROJECT_NAME'] == 'gitlab-ee' || File.exist?('CHANGELOG-EE.md') + # Support former project name for `dev` + %w[gitlab gitlab-ee].include?(ENV['CI_PROJECT_NAME']) end def initialize(project_path: ENV['CI_PROJECT_PATH'], gitlab_token: ENV['GITLAB_BOT_REVIEW_APPS_CLEANUP_TOKEN']) diff --git a/scripts/trigger-build b/scripts/trigger-build index 4d8110fce10..fe036dae99e 100755 --- a/scripts/trigger-build +++ b/scripts/trigger-build @@ -12,7 +12,8 @@ end module Trigger def self.ee? - ENV['CI_PROJECT_NAME'] == 'gitlab-ee' || File.exist?('CHANGELOG-EE.md') + # Support former project name for `dev` + %w[gitlab gitlab-ee].include?(ENV['CI_PROJECT_NAME']) end class Base |