summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-20 18:30:01 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-20 18:30:01 +0000
commit60c3e841ce4f0bb29917bff6318167f5b417c426 (patch)
tree9499fcf26a2bc284a7b946545ad2772b868c833c /CHANGELOG
parentc0090a3ff50802d796ec36f49ade1bb4fdd4d190 (diff)
parent9afd04842f6658dcd1dc02cda17247c321ff6a67 (diff)
downloadgitlab-ce-60c3e841ce4f0bb29917bff6318167f5b417c426.tar.gz
Merge branch 'gitlab_emoji_gem' into 'master'
Replace gemoji with open source PhantomOpenEmoji
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a9a8c00666d..f2124408b42 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@ v 6.7.0
- Better API responses for access_levels (sponsored by O'Reilly Media)
- Requires at least 2 unicorn workers
- Requires gitlab-shell v1.9+
+ - Replaced gemoji(due to closed licencing problem) with Phantom Open Emoji library(combined SIL Open Font License, MIT License and the CC 3.0 License)
v 6.6.5
- Added option to remove issue assignee on project issue page and issue edit page (Jason Blanchard)