diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-19 13:56:08 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-19 13:56:08 +0000 |
commit | cc46a0d47c5660583455c203a93f3333af42f4a8 (patch) | |
tree | deef0c7ac7a1bd2468a576556c7971a8abc3e7d4 /CHANGELOG.md | |
parent | 12f649fe2a83dd637aeb700fc98cdcfcd9ac2100 (diff) | |
parent | 9c8c5e9dc050f32cec05f6903105ff34d726979b (diff) | |
download | gitlab-ce-cc46a0d47c5660583455c203a93f3333af42f4a8.tar.gz |
Merge branch 'fix-escaping' into 'master'
fix: commit messages being double-escaped in activities tab
See merge request !6937
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r-- | CHANGELOG.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f1ef9238c10..c866696889e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -122,6 +122,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Cleanup Ci::ApplicationController. !6757 (Takuya Noguchi) - Fixes padding in all clipboard icons that have .btn class - Fix a typo in doc/api/labels.md + - Fix double-escaping in activities tab (Alexandre Maia) - API: all unknown routing will be handled with 404 Not Found - Add docs for request profiling - Delete dynamic environments |