summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-12-11 12:49:55 -0500
committerRobert Speicher <rspeicher@gmail.com>2015-12-11 12:49:55 -0500
commit48eccdb2fcfa28c2ab602b76b97ff064195bb113 (patch)
tree861f99f97ed5f1dbab67cbb14c71f05e73299e54 /CHANGELOG
parenta2a68858c88151ce0d77f602dbae59d595495ac6 (diff)
parent1a9d6ec71eafddf8cd6542b47b5473a6a3ba19b9 (diff)
downloadgitlab-ce-48eccdb2fcfa28c2ab602b76b97ff064195bb113.tar.gz
Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master'
Fix delete notes on merge request diff Fixes #3971 See merge request !2061
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 61068d3efb1..4c8d8dcd4df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -45,6 +45,7 @@ v 8.3.0 (unreleased)
- Accept COPYING,COPYING.lesser, and licence as license file (Zeger-Jan van de Weg)
- Fix emoji aliases problem
- Fix award-emojis Flash alert's width
+ - Fix deleting notes on a merge request diff
v 8.2.3
- Fix application settings cache not expiring after changes (Stan Hu)