summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-21 03:06:07 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-21 03:06:07 +0000
commitf610aa7c6d6e98e72f630b7e9170fd060ed963f8 (patch)
tree972d953c7958aa9d154f3ef46b7f860cfbc7d9a2 /lib
parent12577c6e3988054d510529d8de4ec99d1cdbfc85 (diff)
downloadgitlab-ce-f610aa7c6d6e98e72f630b7e9170fd060ed963f8.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/danger/helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/danger/helper.rb b/lib/gitlab/danger/helper.rb
index e2911b4e6c8..e4691efdf37 100644
--- a/lib/gitlab/danger/helper.rb
+++ b/lib/gitlab/danger/helper.rb
@@ -35,7 +35,7 @@ module Gitlab
end
def ee?
- ENV['CI_PROJECT_NAME'] == 'gitlab-ee' || File.exist?('../../CHANGELOG-EE.md')
+ ENV['CI_PROJECT_NAME'] == 'gitlab' || File.exist?('../../CHANGELOG-EE.md')
end
def gitlab_helper
@@ -52,7 +52,7 @@ module Gitlab
end
def project_name
- ee? ? 'gitlab-ee' : 'gitlab-ce'
+ ee? ? 'gitlab' : 'gitlab-foss'
end
def markdown_list(items)