From ee01f095a47befaa0c7444ae14b45e0545ce54cd Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 20 Jul 2019 23:06:32 +0800 Subject: [PATCH 1/2] Fix merge_request value in -30974-issue-search-by-number.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There was an syntax issue here which caused it can't be parsed properly. cc !28302 yaml-lint(https://www.npmjs.com/package/yaml-lint): ``` ✖ unknown tag ! at line 4, column 1: author: Riccardo Padovani ^ ``` Online YAML Parser:(https://yaml-online-parser.appspot.com/) ``` ERROR: could not determine a constructor for the tag '!28302' in "", line 3, column 16: merge_request: !28302 ... ^ ``` --- changelogs/unreleased/-30974-issue-search-by-number.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/-30974-issue-search-by-number.yml b/changelogs/unreleased/-30974-issue-search-by-number.yml index 1e6642ec102..da50ee32c83 100644 --- a/changelogs/unreleased/-30974-issue-search-by-number.yml +++ b/changelogs/unreleased/-30974-issue-search-by-number.yml @@ -1,5 +1,5 @@ --- title: "Search issuables by iids" -merge_request: !28302 +merge_request: 28302 author: Riccardo Padovani type: fixed -- GitLab From 592e042369fca677933ae22154b4b7cee0200ecd Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sat, 20 Jul 2019 23:11:21 +0800 Subject: [PATCH 2/2] Remove filename leading slash of -30974-issue-search-by-number.yml The leading slash will cause some not friendly command line behavier, for example: vim: ``` ~/gitlab-ce/changelogs/unreleased $ vim -30974-issue-search-by-number.yml VIM - Vi IMproved 7.4 (2013 Aug 10, compiled Jun 07 2019 15:35:43) Unknown option argument: "-30974-issue-search-by-number.yml" More info with: "vim -h" ``` git: ``` ~/gitlab-ce/changelogs/unreleased $ git add -30974-issue-search-by-number.yml error: unknown switch `3' usage: git add [] [--] ... -n, --dry-run dry run -v, --verbose be verbose -i, --interactive interactive picking -p, --patch select hunks interactively -e, --edit edit current diff and apply -f, --force allow adding otherwise ignored files -u, --update update tracked files -N, --intent-to-add record only the fact that the path will be added later -A, --all add changes from all tracked and untracked files --ignore-removal ignore paths removed in the working tree (same as --no-all) --refresh don't add, only refresh the index --ignore-errors just skip files which cannot be added because of errors --ignore-missing check if - even missing - files are ignored in dry run ``` There's no other unreleased changelog has a filename with leading slash, so I think this one should be corrected. cc !28302 --- ...ssue-search-by-number.yml => 30974-issue-search-by-number.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelogs/unreleased/{-30974-issue-search-by-number.yml => 30974-issue-search-by-number.yml} (100%) diff --git a/changelogs/unreleased/-30974-issue-search-by-number.yml b/changelogs/unreleased/30974-issue-search-by-number.yml similarity index 100% rename from changelogs/unreleased/-30974-issue-search-by-number.yml rename to changelogs/unreleased/30974-issue-search-by-number.yml -- GitLab