summaryrefslogtreecommitdiff
path: root/danger
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-02-07 14:38:32 +0000
committerNick Thomas <nick@gitlab.com>2019-02-13 16:30:02 +0000
commit235fe67bdbc7f177a6f4b213bb1780f043944246 (patch)
tree21b43545030538c9efa50f4730339d78742de80d /danger
parentf034a352507f09aca1a656f2bbf88c8dd8af103b (diff)
downloadgitlab-ce-235fe67bdbc7f177a6f4b213bb1780f043944246.tar.gz
Move the ee? helper method into the helper
Diffstat (limited to 'danger')
-rw-r--r--danger/changelog/Dangerfile6
-rw-r--r--danger/plugins/helper.rb5
2 files changed, 6 insertions, 5 deletions
diff --git a/danger/changelog/Dangerfile b/danger/changelog/Dangerfile
index 530c6638653..63b2f6f5c5c 100644
--- a/danger/changelog/Dangerfile
+++ b/danger/changelog/Dangerfile
@@ -16,16 +16,12 @@ consider adding any of the %<labels>s labels.
#{SEE_DOC}
MSG
-def ee?
- ENV['CI_PROJECT_NAME'] == 'gitlab-ee' || File.exist?('../../CHANGELOG-EE.md')
-end
-
def ee_changelog?(changelog_path)
changelog_path =~ /unreleased-ee/
end
def ce_port_changelog?(changelog_path)
- ee? && !ee_changelog?(changelog_path)
+ helper.ee? && !ee_changelog?(changelog_path)
end
def check_changelog(path)
diff --git a/danger/plugins/helper.rb b/danger/plugins/helper.rb
index 1a2710463ad..09ee50a2ef0 100644
--- a/danger/plugins/helper.rb
+++ b/danger/plugins/helper.rb
@@ -31,6 +31,11 @@ module Danger
.sort
end
+ # @return [Boolean]
+ def ee?
+ ENV['CI_PROJECT_NAME'] == 'gitlab-ee' || File.exist?('../../CHANGELOG-EE.md')
+ end
+
# @return [Hash<String,Array<String>>]
def changes_by_category
all_changed_files.inject(Hash.new { |h, k| h[k] = [] }) do |hsh, file|