Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 18 insertions, 26 deletions

diff --git a/app/models/project_team.rb b/app/models/project_team.rb
index c3c7508df9f..4b89d95c1a3 100644
--- a/app/models/project_team.rb
+++ b/app/models/project_team.rb
@@ -23,6 +23,10 @@ class ProjectTeam
     add_user(user, :maintainer, current_user: current_user)
   end
 
+  def add_owner(user, current_user: nil)
+    add_user(user, :owner, current_user: current_user)
+  end
+
   def add_role(user, role, current_user: nil)
     public_send(:"add_#{role}", user, current_user: current_user) # rubocop:disable GitlabSecurity/PublicSend
   end
@@ -103,7 +107,9 @@ class ProjectTeam
       if group
         group.owners
       else
-        [project.owner]
+        # workaround until we migrate Project#owners to have membership with
+        # OWNER access level
+        Array.wrap(fetch_members(Gitlab::Access::OWNER)) | Array.wrap(project.owner)
       end
   end
 
@@ -173,7 +179,9 @@ class ProjectTeam
   #
   # Returns a Hash mapping user ID -> maximum access level.
   def max_member_access_for_user_ids(user_ids)
-    project.max_member_access_for_resource_ids(User, user_ids) 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)
@@ -190,31 +198,15 @@ class ProjectTeam
   end
 
   def contribution_check_for_user_ids(user_ids)
-    user_ids = user_ids.uniq
-    key = "contribution_check_for_users:#{project.id}"
-
-    Gitlab::SafeRequestStore[key] ||= {}
-    contributors = Gitlab::SafeRequestStore[key] || {}
-
-    user_ids -= contributors.keys
-
-    return contributors if user_ids.empty?
-
-    resource_contributors = project.merge_requests
-                                   .merged
-                                   .where(author_id: user_ids, target_branch: project.default_branch.to_s)
-                                   .pluck(:author_id)
-                                   .product([true]).to_h
-
-    contributors.merge!(resource_contributors)
-
-    missing_resource_ids = user_ids - resource_contributors.keys
-
-    missing_resource_ids.each do |resource_id|
-      contributors[resource_id] = false
+    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)
+             .pluck(:author_id)
+             .product([true]).to_h
     end
-
-    contributors
   end
 
   def contributor?(user_id)