1 files changed, 28 insertions, 4 deletions
diff --git a/danger/changelog/Dangerfile b/danger/changelog/Dangerfile
index 444303d4b9e..6f045d7b5ab 100644
--- a/danger/changelog/Dangerfile
+++ b/danger/changelog/Dangerfile
@@ -21,6 +21,7 @@ def check_changelog_yaml(path)
   fail "`type` should be set, in #{helper.html_link(path)}! #{SEE_DOC}" if yaml["type"].nil?
 
   return if helper.security_mr?
+  return if helper.mr_iid.to_s.empty?
 
   cherry_pick_against_stable_branch = helper.cherry_pick_mr? && helper.stable_branch?
 
@@ -28,12 +29,12 @@ def check_changelog_yaml(path)
     mr_line = raw_file.lines.find_index("merge_request:\n")
 
     if mr_line
-      markdown(format(SUGGEST_MR_COMMENT, mr_iid: gitlab.mr_json["iid"]), file: path, line: mr_line.succ)
+      markdown(format(SUGGEST_MR_COMMENT, mr_iid: helper.mr_iid), file: path, line: mr_line.succ)
     else
-      message "Consider setting `merge_request` to #{gitlab.mr_json["iid"]} in #{helper.html_link(path)}. #{SEE_DOC}"
+      message "Consider setting `merge_request` to #{helper.mr_iid} in #{helper.html_link(path)}. #{SEE_DOC}"
     end
-  elsif yaml["merge_request"] != gitlab.mr_json["iid"] && !cherry_pick_against_stable_branch
-    fail "Merge request ID was not set to #{gitlab.mr_json["iid"]}! #{SEE_DOC}"
+  elsif yaml["merge_request"] != helper.mr_iid && !cherry_pick_against_stable_branch
+    fail "Merge request ID was not set to #{helper.mr_iid}! #{SEE_DOC}"
   end
 rescue Psych::Exception
   # YAML could not be parsed, fail the build.
@@ -73,3 +74,26 @@ elsif changelog.required?
 elsif changelog.optional?
   message changelog.optional_text
 end
+
+message <<~MSG
+  We are in the process of rolling out a new workflow for adding changelog entries. This new workflow uses Git commit subjects and Git trailers to generate changelogs. This new approach will soon replace the current YAML based approach.
+
+  To ease the transition process, we recommend you start using both the old and new approach in parallel. This is not required at this time, but will make it easier to transition to the new approach in the future. To do so, pick the commit that should go in the changelog and add a `Changelog` trailer to it.  For example:
+
+  ```
+  This is my commit's subject line
+
+  This is the optional commit body.
+
+  Changelog: added
+  ```
+
+  The value of the `Changelog` trailer should be one of the following: added, fixed, changed, deprecated, removed, security, performance, other.
+
+  For more information, take a look at the following resources:
+
+  - https://gitlab.com/gitlab-com/gl-infra/delivery/-/issues/1564
+  - https://docs.gitlab.com/ee/api/repositories.html#generate-changelog-data
+
+  If you'd like to see the new approach in action, take a look at the commits in [the Omnibus repository](https://gitlab.com/gitlab-org/omnibus-gitlab/-/commits/master).
+MSG