diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-03-07 02:23:14 +0300 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-03-07 02:23:14 +0300 |
| commit | 5ea6f4b017ae5cecf431d26bbf69fea524fe9428 (patch) | |
| tree | 5ebd7ca37674cf271e14b1a255bf3accef3973e4 /app/controllers | |
| parent | f911b948e9b376e65f5d5bf7e6d09b32e3c995c8 (diff) | |
| parent | ca132c7344dcc45992b00b25a4f141179a628b6a (diff) | |
Merge branch '26371-native-emojis-v3-code' into '26371-native-emojis-v3'
Native Unicode Emojis
See merge request !9570
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/emojis_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/projects/autocomplete_sources_controller.rb | 6 |
2 files changed, 1 insertions, 11 deletions
diff --git a/app/controllers/emojis_controller.rb b/app/controllers/emojis_controller.rb deleted file mode 100644 index 1bec5a7d27f..00000000000 --- a/app/controllers/emojis_controller.rb +++ /dev/null @@ -1,6 +0,0 @@ -class EmojisController < ApplicationController - layout false - - def index - end -end diff --git a/app/controllers/projects/autocomplete_sources_controller.rb b/app/controllers/projects/autocomplete_sources_controller.rb index d9dfa534669..ffb54390965 100644 --- a/app/controllers/projects/autocomplete_sources_controller.rb +++ b/app/controllers/projects/autocomplete_sources_controller.rb @@ -1,9 +1,5 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController - before_action :load_autocomplete_service, except: [:emojis, :members] - - def emojis - render json: Gitlab::AwardEmoji.urls - end + before_action :load_autocomplete_service, except: [:members] def members render json: ::Projects::ParticipantsService.new(@project, current_user).execute(noteable) |