diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-02-19 08:11:02 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-02-19 16:29:55 +0100 |
commit | da0953e65273b1346567dff09518c3eeb7463c6f (patch) | |
tree | fcad5a5cbdea1f3f23c88f96a3b72e34c373f79b /app/helpers | |
parent | f30004819a7c15ad53a863c9648b7d687c5af405 (diff) | |
download | gitlab-ce-da0953e65273b1346567dff09518c3eeb7463c6f.tar.gz |
Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness :sparkles:
Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)
See merge request !2800
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/application_helper.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ecefa9b006d..f0aa2b57121 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -118,12 +118,6 @@ module ApplicationHelper grouped_options_for_select(options, @ref || @project.default_branch) end - 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 - end - # Define whenever show last push event # with suggestion to create MR def show_last_push_widget?(event) |