From 02341c59744dbb644101b313c8dcb329100e0ed5 Mon Sep 17 00:00:00 2001 From: kushalpandya <kushalspandya@gmail.com> Date: Wed, 12 Jul 2017 00:44:36 +0530 Subject: [PATCH] Update CHANGELOG.md for 9.3.6 [ci skip] --- CHANGELOG.md | 7 +++++++ changelogs/unreleased/33580-fix-api-scoping.yml | 4 ---- changelogs/unreleased/dm-encode-tree-and-blob-paths.yml | 5 ----- changelogs/unreleased/issue-description-gfm.yml | 4 ---- .../username-password-stripped-from-import-url-fix.yml | 4 ---- 5 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 changelogs/unreleased/33580-fix-api-scoping.yml delete mode 100644 changelogs/unreleased/dm-encode-tree-and-blob-paths.yml delete mode 100644 changelogs/unreleased/issue-description-gfm.yml delete mode 100644 changelogs/unreleased/username-password-stripped-from-import-url-fix.yml diff --git a/CHANGELOG.md b/CHANGELOG.md index c15a59d25d4..c181aba0205 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 9.3.6 (2017-07-12) + +- Fix API Scoping. !12300 +- Username and password are no longer stripped from import url on mirror update. !12725 +- Fix issues with non-UTF8 filenames by always fixing the encoding of tree and blob paths. +- Fixed GFM references not being included when updating issues inline. + ## 9.3.5 (2017-07-05) - Remove "Remove from board" button from backlog and closed list. !12430 diff --git a/changelogs/unreleased/33580-fix-api-scoping.yml b/changelogs/unreleased/33580-fix-api-scoping.yml deleted file mode 100644 index f4ebb13c082..00000000000 --- a/changelogs/unreleased/33580-fix-api-scoping.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Fix API Scoping -merge_request: 12300 -author: diff --git a/changelogs/unreleased/dm-encode-tree-and-blob-paths.yml b/changelogs/unreleased/dm-encode-tree-and-blob-paths.yml deleted file mode 100644 index c1a026e1f29..00000000000 --- a/changelogs/unreleased/dm-encode-tree-and-blob-paths.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix issues with non-UTF8 filenames by always fixing the encoding of tree and - blob paths -merge_request: -author: diff --git a/changelogs/unreleased/issue-description-gfm.yml b/changelogs/unreleased/issue-description-gfm.yml deleted file mode 100644 index 4d421bff677..00000000000 --- a/changelogs/unreleased/issue-description-gfm.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Fixed GFM references not being included when updating issues inline -merge_request: -author: diff --git a/changelogs/unreleased/username-password-stripped-from-import-url-fix.yml b/changelogs/unreleased/username-password-stripped-from-import-url-fix.yml deleted file mode 100644 index 571279d3dc7..00000000000 --- a/changelogs/unreleased/username-password-stripped-from-import-url-fix.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Username and password are no longer stripped from import url on mirror update -merge_request: 12725 -author: -- GitLab