Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-07-18 14:16:36 +0300
committerDouwe Maan <douwe@gitlab.com>2018-07-18 14:16:36 +0300
commitc35089d6658d19efe0b7a700d63dcce7866093bf (patch)
treedace9645b78f56e2a4672df36caaf182ddbcb275 /app/helpers
parentb341b2ad52757fc8488eeb29dcd909f7f0b81c4e (diff)
parentdcae1cc908532bb0f8e12f446e542108b90ad59f (diff)
Merge branch 'rd-48920-backend-support-for-clarifying-search-bar' into 'master'
Add avatar_url attr to the response of the autocomplete endpoint Closes #48920 See merge request gitlab-org/gitlab-ce!20661
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/search_helper.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index f7dafca7834..cadb88ba632 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -105,7 +105,8 @@ module SearchHelper
category: "Groups",
id: group.id,
label: "#{search_result_sanitize(group.full_name)}",
- url: group_path(group)
+ url: group_path(group),
+ avatar_url: group.avatar_url || ''
}
end
end
@@ -119,7 +120,8 @@ module SearchHelper
id: p.id,
value: "#{search_result_sanitize(p.name)}",
label: "#{search_result_sanitize(p.full_name)}",
- url: project_path(p)
+ url: project_path(p),
+ avatar_url: p.avatar_url || ''
}
end
end