Merge pull request #1712 from riyad/use-gem-for-emoji

Use gem for Emoji

Merge pull request #1712 from riyad/use-gem-for-emoji
Use gem for Emoji
Dmitriy Zaporozhets
2 parents 61e5fb6f ce910147
Showing 852 changed files with 5 additions and 6 deletions Show diff stats
Gemfile
Gemfile.lock
app/helpers/application_helper.rb
lib/emoji.rb
lib/gitlab/markdown.rb
vendor/assets/images/emoji/+1.png
vendor/assets/images/emoji/-1.png
vendor/assets/images/emoji/100.png
vendor/assets/images/emoji/109.png
vendor/assets/images/emoji/1234.png
vendor/assets/images/emoji/8ball.png
vendor/assets/images/emoji/a.png
vendor/assets/images/emoji/ab.png
vendor/assets/images/emoji/abc.png
vendor/assets/images/emoji/abcd.png
vendor/assets/images/emoji/accept.png
vendor/assets/images/emoji/aerial_tramway.png
vendor/assets/images/emoji/airplane.png
vendor/assets/images/emoji/alarm_clock.png
vendor/assets/images/emoji/alien.png
@@ -94,6 +94,7 @@ gem &#39;settingslogic&#39;
 # 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?
@@ -1,4 +0,0 @@
-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
	@@ -94,6 +94,7 @@ gem 'settingslogic'		@@ -94,6 +94,7 @@ gem 'settingslogic'
94		94
95	# Misc	95	# Misc
96	gem "foreman"	96	gem "foreman"
		97	+gem 'gemoji', require: 'emoji/railtie'
97	gem "git"	98	gem "git"
98		99
99	group :assets do	100	group :assets do
	@@ -140,6 +140,7 @@ GEM		@@ -140,6 +140,7 @@ GEM
140	sass-rails (>= 3.1.1)	140	sass-rails (>= 3.1.1)
141	foreman (0.47.0)	141	foreman (0.47.0)
142	thor (>= 0.13.6)	142	thor (>= 0.13.6)
		143	+ gemoji (1.1.1)
143	gherkin-ruby (0.2.1)	144	gherkin-ruby (0.2.1)
144	git (1.2.5)	145	git (1.2.5)
145	github-linguist (2.3.4)	146	github-linguist (2.3.4)
	@@ -422,6 +423,7 @@ DEPENDENCIES		@@ -422,6 +423,7 @@ DEPENDENCIES
422	ffaker	423	ffaker
423	font-awesome-sass-rails (~> 2.0.0)	424	font-awesome-sass-rails (~> 2.0.0)
424	foreman	425	foreman
		426	+ gemoji
425	git	427	git
426	github-linguist (~> 2.3.4)	428	github-linguist (~> 2.3.4)
427	github-markup (~> 0.7.4)	429	github-markup (~> 0.7.4)
	@@ -115,7 +115,7 @@ module ApplicationHelper		@@ -115,7 +115,7 @@ module ApplicationHelper
115	def emoji_autocomplete_source	115	def emoji_autocomplete_source
116	# should be an array of strings	116	# should be an array of strings
117	# so to_s can be called, because it is sufficient and to_json is too slow	117	# so to_s can be called, because it is sufficient and to_json is too slow
118	- Emoji::NAMES.to_s	118	+ Emoji.names.to_s
119	end	119	end
120		120
121	def ldap_enable?	121	def ldap_enable?
	@@ -1,4 +0,0 @@	@@ -1,4 +0,0 @@
1	-module Emoji
2	- path = "#{Rails.root}/vendor/assets/images/emoji"
3	- NAMES = Dir["#{path}/*.png"].sort.map {\|f\| File.basename(f, '.png')}
4	-end
	@@ -128,7 +128,7 @@ module Gitlab		@@ -128,7 +128,7 @@ module Gitlab
128	#	128	#
129	# Returns boolean	129	# Returns boolean
130	def valid_emoji?(emoji)	130	def valid_emoji?(emoji)
131	- Emoji::NAMES.include? emoji	131	+ Emoji.names.include? emoji
132	end	132	end
133		133
134	# Private: Dispatches to a dedicated processing method based on reference	134	# Private: Dispatches to a dedicated processing method based on reference