From 5e11c9b77cb1b2b77ee29359047b55807afe255d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 10 Dec 2019 12:07:55 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- danger/changelog/Dangerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'danger') diff --git a/danger/changelog/Dangerfile b/danger/changelog/Dangerfile index c5d02e1d320..f8e31323f41 100644 --- a/danger/changelog/Dangerfile +++ b/danger/changelog/Dangerfile @@ -29,8 +29,8 @@ def ce_port_changelog?(changelog_path) helper.ee? && !ee_changelog?(changelog_path) end -def docs_only_change? - helper.changes_by_category.keys == [:docs] +def categories_need_changelog? + (helper.changes_by_category.keys - %i[docs none]).any? end def check_changelog(path) @@ -59,7 +59,7 @@ def sanitized_mr_title gitlab.mr_json["title"].gsub(/^WIP: */, '').gsub(/`/, '\\\`') end -changelog_needed = !docs_only_change? && (gitlab.mr_labels & NO_CHANGELOG_LABELS).empty? +changelog_needed = categories_need_changelog? && (gitlab.mr_labels & NO_CHANGELOG_LABELS).empty? changelog_found = git.added_files.find { |path| path =~ %r{\A(ee/)?(changelogs/unreleased)(-ee)?/} } if git.modified_files.include?("CHANGELOG.md") -- cgit v1.2.3