diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-16 16:26:40 +0200 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2012-10-18 01:10:35 +0200 |
| commit | ce91014730e59101af3dd52ae7cd6f3070954fa4 (patch) | |
| tree | 373363df72b271ce4daf3ad0bc83f47f5e3e2782 | |
| parent | 5d42d92c870b80ebccb4def8f6cb185c2badb17f (diff) | |
| download | gitlab-ce-ce91014730e59101af3dd52ae7cd6f3070954fa4.tar.gz | |
Fix use of Emoji
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/markdown.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d27f4de3851..a4d36c9bbc8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -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? diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index ba993abf7f7..f88d1aed080 100644 --- a/lib/gitlab/markdown.rb +++ b/lib/gitlab/markdown.rb @@ -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 |