diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-01-10 10:50:13 -0500 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2017-01-10 10:50:13 -0500 |
| commit | 55cea57f2a09d9021b5e5144a727d965502ca66d (patch) | |
| tree | b7295fc48761686afd15bc395b2220dae0c5f51b | |
| parent | e51acb0566006e9374ff59686553381c6ec52820 (diff) | |
| download | gitlab-ce-55cea57f2a09d9021b5e5144a727d965502ca66d.tar.gz | |
Update CHANGELOG.md for 8.14.6
[ci skip]
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/patch-turbolinks.yml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/update-gitlab-markup-gem.yml | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a2f7f7d60c..de6530edc0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 8.14.6 (2017-01-10) + +- Update the gitlab-markup gem to the version 1.5.1. !8509 +- Updated Turbolinks to mitigate potential XSS attacks. + ## 8.14.5 (2016-12-14) - Moved Leave Project and Leave Group buttons to access_request_buttons from the settings dropdown. !7600 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: |