Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <git@zjvandeweg.nl>2018-05-18 16:07:59 +0300
committerZeger-Jan van de Weg <git@zjvandeweg.nl>2018-05-18 16:41:18 +0300
commitb08b183ac323b167bf2f75f58077624f26ddbd6a (patch)
tree9fde98ccb2ff936e6a7255f44aebdc1dc7815b0f /Dangerfile
parentd3b25cd50a1d638ab797c05a8d2a385b7c57ad09 (diff)
Fix Dangerfile bad changelog detection
Diffstat (limited to 'Dangerfile')
-rw-r--r--Dangerfile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Dangerfile b/Dangerfile
index 2f3e6ce6e..f1bb16150 100644
--- a/Dangerfile
+++ b/Dangerfile
@@ -12,10 +12,10 @@ def check_changelog(path)
if !git.added_files.include?(path)
warn("No changelog entry was generated, please do so by executing _support/changelog")
else
- yaml = YAML.safe_load(yaml)
+ yaml = YAML.safe_load(File.read(path))
- unless yaml['merge_request'] == gitlab.mr["iid"]
- fail("Merge request ID was set to #{yaml['merge_request']}, expected #{gitlab.mr['iid']}")
+ unless yaml['merge_request'] == gitlab.mr_json["iid"]
+ fail("Merge request ID was not set to #{gitlab.mr_json['iid']}")
end
unless yaml['title'] == gitlab.mr_title
@@ -38,3 +38,5 @@ if git.modified_files.include?(VENDOR_JSON)
fail("gitaly-proto version is incorrect")
end
end
+
+# vim: ft=ruby