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

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkushalpandya <kushalspandya@gmail.com>2017-07-11 22:14:36 +0300
committerkushalpandya <kushalspandya@gmail.com>2017-07-11 22:14:36 +0300
commit1c688360d1906166ef155da3c7aa1289a402ecdf (patch)
tree6f5043e996473fe269d0ded4d27098815f45d5c5
parentfc47487c9caf34b7b153c279b8ee8f320e2e4a1e (diff)
Update CHANGELOG.md for 9.3.6
[ci skip]
-rw-r--r--CHANGELOG.md7
-rw-r--r--changelogs/unreleased/33580-fix-api-scoping.yml4
-rw-r--r--changelogs/unreleased/dm-encode-tree-and-blob-paths.yml5
-rw-r--r--changelogs/unreleased/issue-description-gfm.yml4
-rw-r--r--changelogs/unreleased/username-password-stripped-from-import-url-fix.yml4
5 files changed, 7 insertions, 17 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0210600632e..78e09eb2e6d 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: