diff options
Diffstat (limited to 'app/models/concerns/approvable.rb')
| -rw-r--r-- | app/models/concerns/approvable.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/models/concerns/approvable.rb b/app/models/concerns/approvable.rb index 55e138d84fb..b2828821c70 100644 --- a/app/models/concerns/approvable.rb +++ b/app/models/concerns/approvable.rb @@ -14,6 +14,7 @@ module Approvable with_approvals .merge(Approval.with_user) .where(users: { id: user_ids }) + .allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/422085') .group(:id) .having("COUNT(users.id) = ?", user_ids.size) end @@ -21,6 +22,7 @@ module Approvable with_approvals .merge(Approval.with_user) .where(users: { username: usernames }) + .allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/422085') .group(:id) .having("COUNT(users.id) = ?", usernames.size) end @@ -34,7 +36,7 @@ module Approvable .where(app_table[:merge_request_id].eq(arel_table[:id])) .select('true') .arel.exists.not - ) + ).allow_cross_joins_across_databases(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/422085') end end @@ -50,8 +52,12 @@ module Approvable approvals.where(user: user).any? end + def approved? + approvals.present? + end + def eligible_for_approval_by?(user) - user && !approved_by?(user) && user.can?(:approve_merge_request, self) + user.present? && !approved_by?(user) && user.can?(:approve_merge_request, self) end def eligible_for_unapproval_by?(user) |