diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-21 15:13:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-21 15:13:58 +0300 |
commit | c0a3d287c0d613cc439a31683d06dd70f3411f8c (patch) | |
tree | 67852660a05456dd7960453f33d7f60650a21cbc /app/assets/javascripts/graphql_shared | |
parent | 0cb932429fb8b8d93d677f0f375f527e9d9a4c9b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/graphql_shared')
-rw-r--r-- | app/assets/javascripts/graphql_shared/queries/users_search.query.graphql | 1 | ||||
-rw-r--r-- | app/assets/javascripts/graphql_shared/queries/users_search_with_mr_permissions.graphql | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/graphql_shared/queries/users_search.query.graphql b/app/assets/javascripts/graphql_shared/queries/users_search.query.graphql index f64c4276deb..c05b4a5950c 100644 --- a/app/assets/javascripts/graphql_shared/queries/users_search.query.graphql +++ b/app/assets/javascripts/graphql_shared/queries/users_search.query.graphql @@ -9,6 +9,7 @@ query projectUsersSearch($search: String!, $fullPath: ID!, $after: String, $firs relations: [DIRECT, INHERITED, INVITED_GROUPS] first: $first after: $after + sort: USER_FULL_NAME_ASC ) { pageInfo { hasNextPage diff --git a/app/assets/javascripts/graphql_shared/queries/users_search_with_mr_permissions.graphql b/app/assets/javascripts/graphql_shared/queries/users_search_with_mr_permissions.graphql index 2bd016feb19..5a589b094de 100644 --- a/app/assets/javascripts/graphql_shared/queries/users_search_with_mr_permissions.graphql +++ b/app/assets/javascripts/graphql_shared/queries/users_search_with_mr_permissions.graphql @@ -8,7 +8,11 @@ query projectUsersSearchWithMRPermissions( ) { workspace: project(fullPath: $fullPath) { id - users: projectMembers(search: $search, relations: [DIRECT, INHERITED, INVITED_GROUPS]) { + users: projectMembers( + search: $search + relations: [DIRECT, INHERITED, INVITED_GROUPS] + sort: USER_FULL_NAME_ASC + ) { nodes { id mergeRequestInteraction(id: $mergeRequestId) { |