diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-28 00:07:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-28 00:07:51 +0000 |
| commit | bba3aae6262b45e5457d0fcaa23e99f815114b4b (patch) | |
| tree | 9510a08bba9514faf620b4244f382c4fc9599637 /danger | |
| parent | f50b93c373428d624cc2cabe98e4022dce846e67 (diff) | |
| download | gitlab-ce-bba3aae6262b45e5457d0fcaa23e99f815114b4b.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'danger')
| -rw-r--r-- | danger/changelog/Dangerfile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |