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:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2017-01-10 19:53:31 +0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2017-01-10 19:53:31 +0300
commit8db96b32419a9523a8f11a2321aae018ad3efa18 (patch)
tree0334634ecff1e69cc34d750b52dd64e7532084a6
parent68f8e3c962f4d321655bf7930b2d883654ae8757 (diff)
Update CHANGELOG.md for 8.13.11
[ci skip]
-rw-r--r--CHANGELOG.md5
-rw-r--r--changelogs/unreleased/patch-turbolinks.yml4
-rw-r--r--changelogs/unreleased/update-gitlab-markup-gem.yml4
3 files changed, 5 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index efc561399d1..2c49f44f849 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.11 (2017-01-10)
+
+- Update the gitlab-markup gem to the version 1.5.1. !8509
+- Updated Turbolinks to mitigate potential XSS attacks.
+
## 8.13.10 (2016-12-14)
- API: Memoize the current_user so that sudo can work properly. !8017
diff --git a/changelogs/unreleased/patch-turbolinks.yml b/changelogs/unreleased/patch-turbolinks.yml
deleted file mode 100644
index 79c62e9c1d5..00000000000
--- a/changelogs/unreleased/patch-turbolinks.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Updated Turbolinks to mitigate potential XSS attacks
-merge_request:
-author:
diff --git a/changelogs/unreleased/update-gitlab-markup-gem.yml b/changelogs/unreleased/update-gitlab-markup-gem.yml
deleted file mode 100644
index 96cdfd051f0..00000000000
--- a/changelogs/unreleased/update-gitlab-markup-gem.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Update the gitlab-markup gem to the version 1.5.1
-merge_request: 8509
-author: