diff options
author | Rémy Coutable <remy@rymai.me> | 2019-08-22 16:03:08 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-08-22 16:03:08 +0000 |
commit | c1d315d4264e7fd5cad2af624a434db662186f93 (patch) | |
tree | 08635dbc0022bf64cd05aceb8d3cadf90afcf3b5 | |
parent | d852112776a5d000a138cd49ad039ff0a87028d5 (diff) | |
parent | 8ad3691b59dacc70f1c838fa08b4a3ce06c9ee39 (diff) | |
download | gitlab-ce-c1d315d4264e7fd5cad2af624a434db662186f93.tar.gz |
Merge branch 'improve-dnager-message-when-changelog-is-needed' into 'master'
Make it clear that it's ok to ignore Danger's 'no changelog' warning
See merge request gitlab-org/gitlab-ce!32088
-rw-r--r-- | danger/changelog/Dangerfile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/danger/changelog/Dangerfile b/danger/changelog/Dangerfile index 63b2f6f5c5c..2d1ca64a9e8 100644 --- a/danger/changelog/Dangerfile +++ b/danger/changelog/Dangerfile @@ -1,19 +1,18 @@ +# frozen_string_literal: true # rubocop:disable Style/SignalException require 'yaml' -NO_CHANGELOG_LABELS = %w[backstage ci-build Documentation meta QA test].freeze -SEE_DOC = "See [the documentation](https://docs.gitlab.com/ce/development/changelog.html).".freeze -CREATE_CHANGELOG_MESSAGE = <<~MSG.freeze +NO_CHANGELOG_LABELS = %w[backstage ci-build meta].freeze +SEE_DOC = "See [the documentation](https://docs.gitlab.com/ce/development/changelog.html)." +CREATE_CHANGELOG_MESSAGE = <<~MSG You can create one with: ``` bin/changelog -m %<mr_iid>s "%<mr_title>s" ``` -If your merge request doesn't warrant a CHANGELOG entry, -consider adding any of the %<labels>s labels. -#{SEE_DOC} +Note: Merge requests with %<labels>s do not trigger this check. MSG def ee_changelog?(changelog_path) @@ -60,7 +59,7 @@ if changelog_needed if changelog_found check_changelog(changelog_found) else - warn "**[CHANGELOG missing](https://docs.gitlab.com/ce/development/changelog.html).**\n\n" + + message "**[CHANGELOG missing](https://docs.gitlab.com/ce/development/changelog.html)**: If this merge request [doesn't need a CHANGELOG entry](https://docs.gitlab.com/ee/development/changelog.html#what-warrants-a-changelog-entry), feel free to ignore this message.\n\n" + format(CREATE_CHANGELOG_MESSAGE, mr_iid: gitlab.mr_json["iid"], mr_title: mr_title, labels: presented_no_changelog_labels) end end |