diff options
| author | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2019-08-25 11:00:08 +0000 |
|---|---|---|
| committer | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2019-08-25 11:00:08 +0000 |
| commit | f2371a89f151da21e2d139f7cb159d611ba6fd0b (patch) | |
| tree | 5692b4b958026565e4438063a522942d9da428eb /app/controllers/autocomplete_controller.rb | |
| parent | d90b361b7c8c1aa7faa9ef1ead40e096d4ae7e42 (diff) | |
| parent | 8112fb37544557b3f94c0a558175d5da99ef9829 (diff) | |
| download | gitlab-ce-docs-gitaly-path-fixes.tar.gz | |
Merge branch 'master' into 'docs-gitaly-path-fixes'docs-gitaly-path-fixes
# Conflicts:
# doc/administration/gitaly/index.md
Diffstat (limited to 'app/controllers/autocomplete_controller.rb')
| -rw-r--r-- | app/controllers/autocomplete_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index f111c7ca8cc..30a567c3bef 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -36,7 +36,7 @@ class AutocompleteController < ApplicationController end def award_emojis - render json: AwardedEmojiFinder.new(current_user).execute + render json: AwardEmojis::CollectUserEmojiService.new(current_user).execute end def merge_request_target_branches |