Merge branch 'prevent-changelog-id-on-security-mrs' into 'master'

Prevent adding changelog ID on security MRs

See merge request gitlab-org/gitlab!28251

danger/changelog/Dangerfile

@@ -28,7 +28,7 @@ def check_changelog_yaml(path)
 
   if yaml["merge_request"].nil? && !helper.security_mr?
     message "Consider setting `merge_request` to #{gitlab.mr_json["iid"]} in #{gitlab.html_link(path)}. #{SEE_DOC}"
-  elsif yaml["merge_request"] != gitlab.mr_json["iid"]
+  elsif yaml["merge_request"] != gitlab.mr_json["iid"] && !helper.security_mr?
     fail "Merge request ID was not set to #{gitlab.mr_json["iid"]}! #{SEE_DOC}"
   end
 rescue Psych::SyntaxError, Psych::DisallowedClass, Psych::BadAlias