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/members/project_member.rb')
-rw-r--r--app/models/members/project_member.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index 9a86b3a3fd9..41ecc4cbf01 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -16,7 +16,7 @@ class ProjectMember < Member
scope :in_project, ->(project) { where(source_id: project.id) }
scope :in_namespaces, ->(groups) do
joins('INNER JOIN projects ON projects.id = members.source_id')
- .where('projects.namespace_id in (?)', groups.select(:id))
+ .where(projects: { namespace_id: groups.select(:id) })
end
scope :without_project_bots, -> do
@@ -69,7 +69,7 @@ class ProjectMember < Member
end
true
- rescue
+ rescue StandardError
false
end
@@ -154,4 +154,4 @@ class ProjectMember < Member
# rubocop: enable CodeReuse/ServiceClass
end
-ProjectMember.prepend_if_ee('EE::ProjectMember')
+ProjectMember.prepend_mod_with('ProjectMember')