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!

What does this MR do?

EE version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21197

What are the relevant issue numbers?

Does this MR meet the acceptance criteria?

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • @jprovaznik thanks, I added a couple of comments, only minor!

  • Jan Provaznik resolved all discussions

    resolved all discussions

  • Jan Provaznik added 640 commits

    added 640 commits

    • 0571f131...40f5e1f1 - 618 commits from branch master
    • 70261ff1 - add users search results to global search
    • 22f44b50 - add users search results to project scoped search
    • 65df88c4 - move ability check from service class to view
    • a52d1dbb - dry up the use of the user search tab
    • a8818bab - add users search results to group scoped search
    • 40962ac4 - add changelog
    • 5a45b54f - search results: show user's status emoji
    • 0592233a - add users search to search api
    • d7a3e54b - only users from groups the current user has access
    • 241f38b0 - project's user search includes group members too
    • 3b01d23a - spec for group's user search incl. parent group
    • db0cf709 - restrict user result set by the scoped group
    • b4437cfa - use project_search_tabs? for user search check
    • 4c684a8d - check ability for user search results
    • c36d9850 - extract helper for search scope api param
    • 55629a2e - add feature flag for users search
    • 6385c722 - move users method to public section
    • b0981097 - return 400 on users search and feature is disabled
    • fcf90d05 - un-dry the search api scope
    • 27ac48c3 - Apply suggestion to lib/api/search.rb
    • 30ca69e0 - Merge branch 'siemens/gitlab-ce-feature/users-search-results' into ee-users-search-results
    • a4ab9ecf - Enable user search if elasticsearch is used

    Compare with previous version

  • Author Maintainer

    @smcgivern could you please review/merge?

  • Sean McGivern approved this merge request

    approved this merge request

  • merged

  • Sean McGivern mentioned in commit 52c378d7

    mentioned in commit 52c378d7

  • Please register or sign in to reply
    Loading