summaryrefslogtreecommitdiff
path: root/app/controllers/projects
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-07-07 14:53:35 -0700
committerStan Hu <stanhu@gmail.com>2018-07-07 14:53:35 -0700
commitb3deab852bcbfe1fd86475d2881cd328c5374b05 (patch)
treed5d0a16918d6b270ddb2b42758dfca71949a808f /app/controllers/projects
parent7967793c5516d1966ed9e3468211529a48b18d9e (diff)
parente0c0ce28ea786a23d15eee95d56560079b0c6dfe (diff)
downloadgitlab-ce-b3deab852bcbfe1fd86475d2881cd328c5374b05.tar.gz
Merge branch 'master' into sh-support-bitbucket-server-import
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/autocomplete_sources_controller.rb2
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