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
+ 0
17
Compare changes
  • Side-by-side
  • Inline
@@ -47,12 +47,6 @@
@@ -47,12 +47,6 @@
= _("Wiki")
= _("Wiki")
%span.badge.badge-pill
%span.badge.badge-pill
= @search_results.wiki_blobs_count
= @search_results.wiki_blobs_count
- if project_search_tabs?(:commits)
%li{ class: active_when(@scope == 'commits') }
= link_to search_filter_path(scope: 'commits') do
= _("Commits")
%span.badge.badge-pill
= @search_results.commits_count
= users
= users
- elsif @show_snippets
- elsif @show_snippets
@@ -103,15 +97,4 @@
@@ -103,15 +97,4 @@
= _("Wiki")
= _("Wiki")
%span.badge.badge-pill
%span.badge.badge-pill
= limited_count(@search_results.wiki_blobs_count)
= limited_count(@search_results.wiki_blobs_count)
%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)
- 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)
= users
= users
Loading