summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-02-19 16:59:36 -0800
committerDouwe Maan <douwe@selenight.nl>2016-02-19 16:59:36 -0800
commitc352aaa008ea3240eaa754d4163769082bc0e8fc (patch)
tree8d51be034f9ebfc6705b829b224a3e9048b5d669 /CHANGELOG
parent20781b29276292f7fe7d1ea751252573bd318086 (diff)
parentaba1aa49a986230d697106117b5e9b0efa97467c (diff)
downloadgitlab-ce-c352aaa008ea3240eaa754d4163769082bc0e8fc.tar.gz
Merge branch '12792-emoji-as-text-diff-comment'
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f89ded67a3d..11a88588be6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -72,6 +72,7 @@ v 8.5.0 (unreleased)
- Allow existing users to auto link their SAML credentials by logging in via SAML
- Make it possible to erase a build (trace, artifacts) using UI and API
- Ability to revert changes from a Merge Request or Commit
+ - Emoji comment on diffs are not award emoji
v 8.4.4
- Update omniauth-saml gem to 1.4.2