summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-06-25 15:51:48 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-06-25 15:51:48 +0000
commit8d10afb5ca4f1f8b68c3ba8a4d5db9ddc37d658f (patch)
treee6e3fe6b727aa91947a2542e6d420bbbac977dcc /app/helpers
parentd73b6d0f455c4b77dbea7e8b5d5a1574fd665fe0 (diff)
parent9e93ea8e64d8aca7f3b2b7fe7a0c7f8a9bd97be5 (diff)
downloadgitlab-ce-8d10afb5ca4f1f8b68c3ba8a4d5db9ddc37d658f.tar.gz
Merge branch '63177-follow-up-from-use-scoped-routes-for-labels-and-milestones' into 'master'
Resolve "Follow-up from "Use scoped routes for labels and milestones"" Closes #63177 See merge request gitlab-org/gitlab-ce!29983
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/search_helper.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index dfa34ad7020..f5c4686a3bf 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -169,18 +169,17 @@ module SearchHelper
autocomplete: 'off'
}
+ opts[:data]['runner-tags-endpoint'] = tag_list_admin_runners_path
+
if @project.present?
opts[:data]['project-id'] = @project.id
- opts[:data]['base-endpoint'] = project_path(@project)
opts[:data]['labels-endpoint'] = project_labels_path(@project)
opts[:data]['milestones-endpoint'] = project_milestones_path(@project)
elsif @group.present?
opts[:data]['group-id'] = @group.id
- opts[:data]['base-endpoint'] = group_canonical_path(@group)
opts[:data]['labels-endpoint'] = group_labels_path(@group)
opts[:data]['milestones-endpoint'] = group_milestones_path(@group)
else
- opts[:data]['base-endpoint'] = root_dashboard_path
opts[:data]['labels-endpoint'] = dashboard_labels_path
opts[:data]['milestones-endpoint'] = dashboard_milestones_path
end