diff options
| author | Mark Chao <mchao@gitlab.com> | 2018-07-06 11:37:58 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2018-07-06 17:03:39 +0800 |
| commit | 389a22e7b72c7514ede515c7c4124719edf2d5a6 (patch) | |
| tree | 9c79e94ed535c0a64db67ab36f4363215fff2e9f /app/controllers | |
| parent | 83f79ced3fd98031194e5667c4d80f66d7987c67 (diff) | |
| download | gitlab-ce-389a22e7b72c7514ede515c7c4124719edf2d5a6.tar.gz | |
Backport of EE changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6195
Refactor AutocompleteSources#label:
1. The return value was inconsistent, sometimes returning a hash and sometimes returning an ActiveModel.
2. It was inconsistent with respect to other methods in the class since they all return ActiveModels.
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 |