Merge branch 'better-search-autocomplete'
This commit is contained in:
commit
2d9d2e7a7c
|
@ -29,6 +29,7 @@ v 8.5.0 (unreleased)
|
||||||
- Improve UI consistency between projects and groups lists
|
- Improve UI consistency between projects and groups lists
|
||||||
- Add sort dropdown to dashboard projects page
|
- Add sort dropdown to dashboard projects page
|
||||||
- Hide remove source branch button when the MR is merged but new commits are pushed (Zeger-Jan van de Weg)
|
- Hide remove source branch button when the MR is merged but new commits are pushed (Zeger-Jan van de Weg)
|
||||||
|
- In seach autocomplete show only groups and projects you are member of
|
||||||
|
|
||||||
v 8.4.3
|
v 8.4.3
|
||||||
- Increase lfs_objects size column to 8-byte integer to allow files larger
|
- Increase lfs_objects size column to 8-byte integer to allow files larger
|
||||||
|
|
|
@ -70,7 +70,7 @@ module SearchHelper
|
||||||
|
|
||||||
# Autocomplete results for the current user's groups
|
# Autocomplete results for the current user's groups
|
||||||
def groups_autocomplete(term, limit = 5)
|
def groups_autocomplete(term, limit = 5)
|
||||||
Group.search(term).limit(limit).map do |group|
|
current_user.authorized_groups.search(term).limit(limit).map do |group|
|
||||||
{
|
{
|
||||||
label: "group: #{search_result_sanitize(group.name)}",
|
label: "group: #{search_result_sanitize(group.name)}",
|
||||||
url: group_path(group)
|
url: group_path(group)
|
||||||
|
@ -80,7 +80,7 @@ module SearchHelper
|
||||||
|
|
||||||
# Autocomplete results for the current user's projects
|
# Autocomplete results for the current user's projects
|
||||||
def projects_autocomplete(term, limit = 5)
|
def projects_autocomplete(term, limit = 5)
|
||||||
ProjectsFinder.new.execute(current_user).search_by_title(term).
|
current_user.authorized_projects.search_by_title(term).
|
||||||
sorted_by_stars.non_archived.limit(limit).map do |p|
|
sorted_by_stars.non_archived.limit(limit).map do |p|
|
||||||
{
|
{
|
||||||
label: "project: #{search_result_sanitize(p.name_with_namespace)}",
|
label: "project: #{search_result_sanitize(p.name_with_namespace)}",
|
||||||
|
|
Loading…
Reference in New Issue