Skip to content
Snippets Groups Projects

[EE] Add users search results to global search

Merged Jan Provaznik requested to merge ee-users-search-results into master
All threads resolved!
1 file
+ 10
12
Compare changes
  • Side-by-side
  • Inline
 
- users = capture_haml do
 
- if can?(current_user, :read_users_list)
 
%li{ class: active_when(@scope == 'users') }
 
= link_to search_filter_path(scope: 'users') do
 
Users
 
%span.badge.badge-pill
 
= limited_count(@search_results.limited_users_count)
 
.scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
.scrolling-tabs-container.inner-page-scroll-tabs.is-smaller
.fade-left= icon('angle-left')
.fade-left= icon('angle-left')
.fade-right= icon('angle-right')
.fade-right= icon('angle-right')
@@ -45,12 +53,7 @@
@@ -45,12 +53,7 @@
= _("Commits")
= _("Commits")
%span.badge.badge-pill
%span.badge.badge-pill
= @search_results.commits_count
= @search_results.commits_count
- if can?(current_user, :read_users_list)
= users
%li{ class: active_when(@scope == 'users') }
= link_to search_filter_path(scope: 'users') do
Users
%span.badge.badge-pill
= limited_count(@search_results.limited_users_count)
- elsif @show_snippets
- elsif @show_snippets
%li{ class: active_when(@scope == 'snippet_blobs') }
%li{ class: active_when(@scope == 'snippet_blobs') }
@@ -84,9 +87,4 @@
@@ -84,9 +87,4 @@
= _("Milestones")
= _("Milestones")
%span.badge.badge-pill
%span.badge.badge-pill
= limited_count(@search_results.limited_milestones_count)
= limited_count(@search_results.limited_milestones_count)
- if can?(current_user, :read_users_list)
= users
%li{ class: active_when(@scope == 'users') }
= link_to search_filter_path(scope: 'users') do
Users
%span.badge.badge-pill
= limited_count(@search_results.limited_users_count)
Loading