diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-06 14:05:05 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-06 14:05:05 +0300 |
| commit | b25a4409559bb28d806aced77fca84c7242ec723 (patch) | |
| tree | 6f6d0817843dca4e801ede2c22f2bf3009bd3552 /app/controllers | |
| parent | 33116c22fea6f035b63f6e904b619d014922d328 (diff) | |
| parent | 389a22e7b72c7514ede515c7c4124719edf2d5a6 (diff) | |
Merge branch 'ce-5605-epic-autocomplete' into 'master'
Backport of EE changes "Add support for autocompleting Epics and Labels within Epics"
See merge request gitlab-org/gitlab-ce!20419
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/autocomplete_sources_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/autocomplete_sources_controller.rb b/app/controllers/projects/autocomplete_sources_controller.rb index 992c8ea6992..07627ffb69f 100644 --- a/app/controllers/projects/autocomplete_sources_controller.rb +++ b/app/controllers/projects/autocomplete_sources_controller.rb @@ -14,7 +14,7 @@ class Projects::AutocompleteSourcesController < Projects::ApplicationController end def labels - render json: @autocomplete_service.labels(target) + render json: @autocomplete_service.labels_as_hash(target) end def milestones |