[EE] Add users search results to global search
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?
-
Changelog entry added, if necessary -
Documentation created/updated -
Tests added for this feature/bug -
Tested in all supported browsers -
Conforms to the code review guidelines -
Conforms to the merge request performance guidelines -
Conforms to the style guides -
Conforms to the database guides -
Link to e2e tests MR added if this MR has Requires e2e tests label. See the Test Planning Process. -
EE specific content should be in the top level /ee
folder -
For a paid feature, have we considered GitLab.com plans, how it works for groups, and is there a design for promoting it to users who aren't on the correct plan? -
Security reports checked/validated by reviewer
Merge request reports
Activity
added 224 commits
-
500ec938...27622e9f - 207 commits from branch
master
- e4069182 - add users search results to global search
- 5ff7443f - add users search results to project scoped search
- afe04b07 - move ability check from service class to view
- aab21cc1 - dry up the use of the user search tab
- 07be0556 - add users search results to group scoped search
- c8ece720 - add changelog
- a74ba980 - search results: show user's status emoji
- 6c7a925e - add users search to search api
- b317d082 - only users from groups the current user has access
- 014ff549 - project's user search includes group members too
- f5db248c - spec for group's user search incl. parent group
- b772f76a - restrict user result set by the scoped group
- 25d53a57 - use project_search_tabs? for user search check
- 58e099b3 - check ability for user search results
- 633b1b72 - extract helper for search scope api param
- 877f894d - add feature flag for users search
- 86ce5a64 - Enable user search
Toggle commit list-
500ec938...27622e9f - 207 commits from branch
3 Warnings This merge request is quite big (more than 589 lines changed), please consider splitting it into multiple merge requests. This merge request adds files that do not enforce frozen string literal. See https://gitlab.com/gitlab-org/gitlab-ce/issues/47424 for more information. This merge request includes more than 10 commits. Please rebase these commits into a smaller number of commits. 1 Message This merge request adds or changes files that require a review from the Technical Writing team. Documentation review
The following files require a review from a technical writer:
doc/api/search.md
The review does not need to block merging this merge request. See the:
- DevOps stages for the appropriate technical writer for this review.
- Documentation workflows for information on when to assign a merge request for review.
Enable Frozen String Literal
The following files should have
# frozen_string_literal: true
on the first line:ee/spec/lib/gitlab/elastic/group_search_results_spec.rb
spec/features/search/user_searches_for_users_spec.rb
spec/lib/gitlab/group_search_results_spec.rb
Reviewer roulette
Changes that require review have been detected! A merge request is normally reviewed by both a reviewer and a maintainer in its primary category (e.g. frontend or backend), and by a maintainer in all other categories.
To spread load more evenly across eligible reviewers, Danger has randomly picked a candidate for each review slot. Feel free to override this selection if you think someone else would be better-suited, or the chosen person is unavailable.
Once you've decided who will review this merge request, mention them as you normally would! Danger does not (yet?) automatically notify them for you.
Category Reviewer Maintainer backend Toon Claes ( @toon
)Grzegorz Bizon ( @grzesiek
)frontend Nathan Friend ( @nfriend
)Tim Zallmann ( @timzallmann
)~Documentation Marcia Ramos ( @marcia
)Generated by
DangerEdited by 🤖 GitLab Bot 🤖added 2224 commits
-
231c2241...3b33db63 - 2204 commits from branch
master
- 69908bb0 - add users search results to global search
- 2bcc3b86 - add users search results to project scoped search
- 18b6df3a - move ability check from service class to view
- be9b7fa2 - dry up the use of the user search tab
- 859eda59 - add users search results to group scoped search
- 6630b49b - add changelog
- 0999866d - search results: show user's status emoji
- 0e1d4cae - add users search to search api
- 7a6f0946 - only users from groups the current user has access
- 12c1d3d0 - project's user search includes group members too
- 5bfa5c65 - spec for group's user search incl. parent group
- b352c3c8 - restrict user result set by the scoped group
- 1adfd6a4 - use project_search_tabs? for user search check
- edde829d - check ability for user search results
- ca5aadba - extract helper for search scope api param
- 9623443d - add feature flag for users search
- 4c9c2487 - move users method to public section
- c7968ea8 - return 400 on users search and feature is disabled
- 9ad1b59a - Merge branch 'siemens/gitlab-ce-feature/users-search-results' into ee-users-search-results
- c51f628d - Enable user search
Toggle commit list-
231c2241...3b33db63 - 2204 commits from branch
added 19 commits
- 55a30fe2 - add users search results to global search
- 7db6ea58 - add users search results to project scoped search
- 93ac9392 - move ability check from service class to view
- f1bef8d0 - dry up the use of the user search tab
- 3f8cc1ea - add users search results to group scoped search
- 8556ece2 - add changelog
- 6a45af05 - search results: show user's status emoji
- 904503c2 - add users search to search api
- 0087551c - only users from groups the current user has access
- 9d147d84 - project's user search includes group members too
- 13108a29 - spec for group's user search incl. parent group
- 0baf0b53 - restrict user result set by the scoped group
- a2b68651 - use project_search_tabs? for user search check
- 9af1cd32 - check ability for user search results
- 4e911121 - extract helper for search scope api param
- f71e24fa - add feature flag for users search
- 6a69ccbd - move users method to public section
- 5e5e137b - return 400 on users search and feature is disabled
- 95ea37d5 - Enable user search
Toggle commit listadded 20 commits
- 69908bb0 - add users search results to global search
- 2bcc3b86 - add users search results to project scoped search
- 18b6df3a - move ability check from service class to view
- be9b7fa2 - dry up the use of the user search tab
- 859eda59 - add users search results to group scoped search
- 6630b49b - add changelog
- 0999866d - search results: show user's status emoji
- 0e1d4cae - add users search to search api
- 7a6f0946 - only users from groups the current user has access
- 12c1d3d0 - project's user search includes group members too
- 5bfa5c65 - spec for group's user search incl. parent group
- b352c3c8 - restrict user result set by the scoped group
- 1adfd6a4 - use project_search_tabs? for user search check
- edde829d - check ability for user search results
- ca5aadba - extract helper for search scope api param
- 9623443d - add feature flag for users search
- 4c9c2487 - move users method to public section
- c7968ea8 - return 400 on users search and feature is disabled
- e2ec5660 - Merge branch 'siemens/gitlab-ce-feature/users-search-results' into ee-users-search-results
- a0d95f01 - Enable user search
Toggle commit list@mdelaossa EE version differs from CE version because it adds support for user also in elasticsearch mode.
additional changes are in this commit: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8985/diffs?commit_id=cf1e45f3c13ff61ca894cdbaaea66fdda1328a37
assigned to @mdelaossa
Thanks @jprovaznik! This LGTM - I had completely forgotten we had talked about not having this data in ElasticSearch
assigned to @jprovaznik
added documentation label
added 4396 commits
-
cf1e45f3...98d3448c - 4394 commits from branch
master
- 9ebeab77 - add users search results to global search
- adaefe19 - Enable user search
-
cf1e45f3...98d3448c - 4394 commits from branch
changed milestone to %11.10
added 110 commits
-
adaefe19...9e795fd9 - 89 commits from branch
master
- c806e7c4 - add users search results to global search
- 9edc6bd4 - add users search results to project scoped search
- dca4ba83 - move ability check from service class to view
- 0cb0b492 - dry up the use of the user search tab
- 1e0781bd - add users search results to group scoped search
- 61cc4f42 - add changelog
- bfd6b20c - search results: show user's status emoji
- 098150a9 - add users search to search api
- f6ed2298 - only users from groups the current user has access
- 4d6c6184 - project's user search includes group members too
- 1ac7e46a - spec for group's user search incl. parent group
- b6785a79 - restrict user result set by the scoped group
- 10b17926 - use project_search_tabs? for user search check
- b90cccc3 - check ability for user search results
- 5f73b41d - extract helper for search scope api param
- 6c97c96d - add feature flag for users search
- 0a394aad - move users method to public section
- 627216ae - return 400 on users search and feature is disabled
- c5b69aed - un-dry the search api scope
- b3c3cbf3 - Merge branch 'siemens/gitlab-ce-feature/users-search-results' into ee-users-search-results
- 8b741d69 - Enable user search if elasticsearch is used
Toggle commit list-
adaefe19...9e795fd9 - 89 commits from branch
@smcgivern could you please review/merge?
assigned to @smcgivern
- Resolved by Jan Provaznik
- Resolved by Jan Provaznik
- Resolved by Jan Provaznik
@jprovaznik thanks, I added a couple of comments, only minor!
assigned to @jprovaznik
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
Toggle commit list-
0571f131...40f5e1f1 - 618 commits from branch
@smcgivern could you please review/merge?
assigned to @smcgivern
mentioned in commit 52c378d7
added Community contribution label
mentioned in issue gitlab-org/release/tasks#731 (closed)
added devopsplan label
added Enterprise Edition label
added typemaintenance label
removed Plan [DEPRECATED] label