summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-10-24 15:25:37 +0200
committerRémy Coutable <remy@rymai.me>2016-10-24 15:25:37 +0200
commit0e43e34b45c6e1de68e65c8a51df078e850ec2c6 (patch)
tree09a1574a9a946ff7f3478bcd6665316e43f63789 /CHANGELOG.md
parent1f84dbaa9a56dd884240c8c4558163c74f53b413 (diff)
parentea6c5c1c0ee8f09fff4dbf02d7bfb65107020996 (diff)
downloadgitlab-ce-0e43e34b45c6e1de68e65c8a51df078e850ec2c6.tar.gz
Merge branch 'barthc/gitlab-ce-prevent_authored_vote_from_notes'
See merge request !6544.
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02291b1679a..53406425f3d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
## 8.14.0 (2016-11-22)
- Adds user project membership expired event to clarify why user was removed (Callum Dryden)
- Trim leading and trailing whitespace on project_path (Linus Thiel)
+ - Prevent award emoji via notes for issues/MRs authored by user (barthc)
- Fix HipChat notifications rendering (airatshigapov, eisnerd)
- Add hover to trash icon in notes !7008 (blackst0ne)
- Simpler arguments passed to named_route on toggle_award_url helper method