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:
Diffstat (limited to 'app/models/project_team.rb')
-rw-r--r--app/models/project_team.rb16
1 files changed, 10 insertions, 6 deletions
diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index ca1064997af..fbdc88e7b76 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -183,9 +183,11 @@ class ProjectTeam
#
# Returns a Hash mapping user ID -> maximum access level.
def max_member_access_for_user_ids(user_ids)
- Gitlab::SafeRequestLoader.execute(resource_key: project.max_member_access_for_resource_key(User),
- resource_ids: user_ids,
- default_value: Gitlab::Access::NO_ACCESS) do |user_ids|
+ Gitlab::SafeRequestLoader.execute(
+ resource_key: project.max_member_access_for_resource_key(User),
+ resource_ids: user_ids,
+ default_value: Gitlab::Access::NO_ACCESS
+ ) do |user_ids|
project.project_authorizations
.where(user: user_ids)
.group(:user_id)
@@ -206,9 +208,11 @@ class ProjectTeam
end
def contribution_check_for_user_ids(user_ids)
- Gitlab::SafeRequestLoader.execute(resource_key: "contribution_check_for_users:#{project.id}",
- resource_ids: user_ids,
- default_value: false) do |user_ids|
+ Gitlab::SafeRequestLoader.execute(
+ resource_key: "contribution_check_for_users:#{project.id}",
+ resource_ids: user_ids,
+ default_value: false
+ ) do |user_ids|
project.merge_requests
.merged
.where(author_id: user_ids, target_branch: project.default_branch.to_s)