Commit ce91014730e59101af3dd52ae7cd6f3070954fa4
1 parent
5d42d92c
Exists in
master
and in
4 other branches
Fix use of Emoji
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
app/helpers/application_helper.rb
| @@ -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? |
lib/gitlab/markdown.rb
| @@ -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 |