diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-05-17 13:20:10 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-05-17 13:26:12 +0300 |
| commit | 77901cfaeaee8bcc5747391f29a0b3be7523bc70 (patch) | |
| tree | b71f86e2598e98da8e4587d34dff84e0d2c4e42a | |
| parent | aa862d7937c802dfea18f190e8ae4d7f9d4f224b (diff) | |
Add missing MR IDs
Files got introduced by https://gitlab.com/gitlab-org/gitaly/merge_requests/719
but were missing numbers in the merge_request field.
| -rw-r--r-- | Dangerfile | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/gitaly-ruby-round-robin.yml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/zj-changelog-merge-conflicts.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Dangerfile b/Dangerfile index ee7e37498..a23885beb 100644 --- a/Dangerfile +++ b/Dangerfile @@ -9,7 +9,7 @@ def check_changelog(path) return end - if git.added_files.include?(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) diff --git a/changelogs/unreleased/gitaly-ruby-round-robin.yml b/changelogs/unreleased/gitaly-ruby-round-robin.yml index b0b03f8b4..2f3209535 100644 --- a/changelogs/unreleased/gitaly-ruby-round-robin.yml +++ b/changelogs/unreleased/gitaly-ruby-round-robin.yml @@ -1,5 +1,5 @@ --- title: Use round robin load balancing instead of 'pick first' for gitaly-ruby -merge_request: +merge_request: 700 author: type: fixed diff --git a/changelogs/unreleased/zj-changelog-merge-conflicts.yml b/changelogs/unreleased/zj-changelog-merge-conflicts.yml index 9e093680d..0691ee2bf 100644 --- a/changelogs/unreleased/zj-changelog-merge-conflicts.yml +++ b/changelogs/unreleased/zj-changelog-merge-conflicts.yml @@ -1,5 +1,5 @@ --- title: Generate changelog when releasing a tag to prevent merge conflicts -merge_request: +merge_request: 719 author: type: other |