......@@ -94,6 +94,7 @@ gem 'settingslogic'
# Misc
gem "foreman"
gem 'gemoji', require: 'emoji/railtie'
gem "git"
group :assets do
......
......
......@@ -140,6 +140,7 @@ GEM
sass-rails (>= 3.1.1)
foreman (0.47.0)
thor (>= 0.13.6)
gemoji (1.1.1)
gherkin-ruby (0.2.1)
git (1.2.5)
github-linguist (2.3.4)
......@@ -422,6 +423,7 @@ DEPENDENCIES
ffaker
font-awesome-sass-rails (~> 2.0.0)
foreman
gemoji
git
github-linguist (~> 2.3.4)
github-markup (~> 0.7.4)
......
......
......@@ -115,7 +115,7 @@ module ApplicationHelper
def emoji_autocomplete_source
# should be an array of strings
# so to_s can be called, because it is sufficient and to_json is too slow
Emoji::NAMES.to_s
Emoji.names.to_s
end
def ldap_enable?
......
......
module Emoji
path = "#{Rails.root}/vendor/assets/images/emoji"
NAMES = Dir["#{path}/*.png"].sort.map {|f| File.basename(f, '.png')}
end
......@@ -128,7 +128,7 @@ module Gitlab
#
# Returns boolean
def valid_emoji?(emoji)
Emoji::NAMES.include? emoji
Emoji.names.include? emoji
end
# Private: Dispatches to a dedicated processing method based on reference
......
......
vendor/assets/images/emoji/+1.png

5.01 KiB

vendor/assets/images/emoji/-1.png

4.95 KiB

vendor/assets/images/emoji/100.png

3.22 KiB

vendor/assets/images/emoji/109.png

3.61 KiB

vendor/assets/images/emoji/1234.png

4.64 KiB

vendor/assets/images/emoji/8ball.png

4.04 KiB

vendor/assets/images/emoji/a.png

3.08 KiB

vendor/assets/images/emoji/ab.png

3.77 KiB

vendor/assets/images/emoji/abc.png

4.15 KiB

vendor/assets/images/emoji/abcd.png

4.37 KiB

vendor/assets/images/emoji/accept.png

4.62 KiB

vendor/assets/images/emoji/aerial_tramway.png

3.41 KiB

vendor/assets/images/emoji/airplane.png

4.63 KiB

vendor/assets/images/emoji/alarm_clock.png

6.9 KiB

vendor/assets/images/emoji/alien.png

5.33 KiB