Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-10-28 03:11:00 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-10-28 03:11:00 +0300
commite39b6277eb4f4560af5c541a79d890e8186f130e (patch)
tree748bfcc631f919e622e560250a464a30c7f458b1 /app/helpers/projects/project_members_helper.rb
parent1f992463a93d2db88a661dd2a60a1f0a81375f44 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers/projects/project_members_helper.rb')
-rw-r--r--app/helpers/projects/project_members_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/projects/project_members_helper.rb b/app/helpers/projects/project_members_helper.rb
index 51a7d3e35d0..e35277eabaa 100644
--- a/app/helpers/projects/project_members_helper.rb
+++ b/app/helpers/projects/project_members_helper.rb
@@ -2,14 +2,14 @@
module Projects::ProjectMembersHelper
def project_members_app_data_json(project, members:, invited:, access_requests:, include_relations:, search:)
- {
+ Gitlab::Json.dump({
user: project_members_list_data(project, members, { param_name: :page, params: { search_groups: nil } }),
group: project_group_links_list_data(project, include_relations, search),
invite: project_members_list_data(project, invited.nil? ? [] : invited),
access_request: project_members_list_data(project, access_requests.nil? ? [] : access_requests),
source_id: project.id,
can_manage_members: Ability.allowed?(current_user, :admin_project_member, project)
- }.to_json
+ })
end
def project_member_header_subtext(project)