Merge remote-tracking branch 'dev/master'

8 files changed, 18 insertions, 29 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e03123111c3..9f0e29a5d82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+## 8.14.4 (2016-12-08)
+
+- Fix diff view permalink highlighting. !7090
+- Fix pipeline author for Slack and use pipeline id for pipeline link. !7506
+- Fix compatibility with Internet Explorer 11 for merge requests. !7525 (Steffen Rauh)
+- Reenables /user API request to return private-token if user is admin and request is made with sudo. !7615
+- Fix Cicking on tabs on pipeline page should set URL. !7709
+- Authorize users into imported GitLab project.
+- Destroy a user's session when they delete their own account.
+- Don't accidentally mark unsafe diff lines as HTML safe.
+- Replace MR access checks with use of MergeRequestsFinder.
+- Remove visible content caching.
+
 ## 8.14.3 (2016-12-02)
 
 - Pass commit data to ProcessCommitWorker to reduce Git overhead. !7744
@@ -251,6 +264,11 @@ entry.
 - Fix "Without projects" filter. !6611 (Ben Bodenmiller)
 - Fix 404 when visit /projects page
 
+## 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/23696-fix-diff-view-highlighting.yml b/changelogs/unreleased/23696-fix-diff-view-highlighting.yml
deleted file mode 100644
index db523caffed..00000000000
--- a/changelogs/unreleased/23696-fix-diff-view-highlighting.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix diff view permalink highlighting
-merge_request: 7090
-author:
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/24814-pipeline-tabs.yml b/changelogs/unreleased/24814-pipeline-tabs.yml
deleted file mode 100644
index f85e7576905..00000000000
--- a/changelogs/unreleased/24814-pipeline-tabs.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix Cicking on tabs on pipeline page should set URL
-merge_request: 7709
-author:
diff --git a/changelogs/unreleased/fix-authorize-users-into-imported-gitlab-project.yml b/changelogs/unreleased/fix-authorize-users-into-imported-gitlab-project.yml
deleted file mode 100644
index 9f14463fdd1..00000000000
--- a/changelogs/unreleased/fix-authorize-users-into-imported-gitlab-project.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Authorize users into imported GitLab project
-merge_request: 
-author: 
diff --git a/changelogs/unreleased/fix-compatibility-with-ie11-for-merge-requests.yml b/changelogs/unreleased/fix-compatibility-with-ie11-for-merge-requests.yml
deleted file mode 100644
index db92e45d8f1..00000000000
--- a/changelogs/unreleased/fix-compatibility-with-ie11-for-merge-requests.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix compatibility with Internet Explorer 11 for merge requests
-merge_request: 7525
-author: Steffen Rauh
diff --git a/changelogs/unreleased/fix-slack-pipeline-event.yml b/changelogs/unreleased/fix-slack-pipeline-event.yml
deleted file mode 100644
index fec864eeb3d..00000000000
--- a/changelogs/unreleased/fix-slack-pipeline-event.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Fix pipeline author for Slack and use pipeline id for pipeline link
-merge_request: 7506
-author:
diff --git a/changelogs/unreleased/remove-has-visible-content-caching.yml b/changelogs/unreleased/remove-has-visible-content-caching.yml
deleted file mode 100644
index e2940c60443..00000000000
--- a/changelogs/unreleased/remove-has-visible-content-caching.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Remove visible content caching
-merge_request: 
-author: