diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-07 05:34:48 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-07 05:34:48 +0300 |
| commit | 0ec62b6c5d686496aa120edd66082af94007ca75 (patch) | |
| tree | fd50989710ca09928c902c933890349a7dc23987 /app/controllers | |
| parent | 55cc28d1ca167b502ef7a2f79b11e75fa559d174 (diff) | |
| parent | 5ea6f4b017ae5cecf431d26bbf69fea524fe9428 (diff) | |
Merge branch '26371-native-emojis-v3' into 'master'
Add emoji images - Base Native Unicode Emojis
Closes #26371
See merge request !9569
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) |