From bba3aae6262b45e5457d0fcaa23e99f815114b4b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 28 Mar 2020 00:07:51 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- danger/changelog/Dangerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'danger') diff --git a/danger/changelog/Dangerfile b/danger/changelog/Dangerfile index ae1a5bbac40..210fe24c1e3 100644 --- a/danger/changelog/Dangerfile +++ b/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 -- cgit v1.2.3