summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlejandro Rodríguez <alejorro70@gmail.com>2016-12-08 13:28:49 -0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2016-12-08 13:28:49 -0300
commit09541373cb3ca9375c7bd5979c721e450ecf20de (patch)
tree50298bb827014c581e0a4b606816a2a0a45c58b0
parent45ab743a6eeeee79fa21cad1aabf99129207f0fd (diff)
downloadgitlab-ce-09541373cb3ca9375c7bd5979c721e450ecf20de.tar.gz
Update CHANGELOG.md for 8.13.9
[ci skip]
-rw-r--r--CHANGELOG.md5
-rw-r--r--changelogs/unreleased/24537-reenable-private-token-with-sudo.yml5
-rw-r--r--changelogs/unreleased/jej-23867-use-mr-finder-instead-of-access-check.yml4
3 files changed, 5 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1bffab8b250..c393792d4fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
Please view this file on the master branch, on stable branches it's out of date.
+## 8.13.9 (2016-12-08)
+
+- Reenables /user API request to return private-token if user is admin and request is made with sudo. !7615
+- Replace MR access checks with use of MergeRequestsFinder.
+
## 8.13.8 (2016-12-02)
- Pass tag SHA to post-receive hook when tag is created via UI. !7700
diff --git a/changelogs/unreleased/24537-reenable-private-token-with-sudo.yml b/changelogs/unreleased/24537-reenable-private-token-with-sudo.yml
deleted file mode 100644
index 9fbbaeb914d..00000000000
--- a/changelogs/unreleased/24537-reenable-private-token-with-sudo.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Reenables /user API request to return private-token if user is admin and request
- is made with sudo
-merge_request: 7615
-author:
diff --git a/changelogs/unreleased/jej-23867-use-mr-finder-instead-of-access-check.yml b/changelogs/unreleased/jej-23867-use-mr-finder-instead-of-access-check.yml
deleted file mode 100644
index 5a4a44b9562..00000000000
--- a/changelogs/unreleased/jej-23867-use-mr-finder-instead-of-access-check.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Replace MR access checks with use of MergeRequestsFinder
-merge_request:
-author: