Commit f8908e68 authored by Sean McGivern's avatar Sean McGivern

fixup! Ensure MR approvals don't get stuck

parent 904b4d39
......@@ -565,13 +565,14 @@ class MergeRequest < ActiveRecord::Base
end
def potential_approvers
has_access = ['access_level > ?', Member::REPORTER]
wheres = [
"id IN (#{overall_approvers.select(:user_id).to_sql})",
"id IN (#{project.members.where(['access_level > ?', Member::REPORTER]).select(:user_id).to_sql})"
"id IN (#{project.members.where(has_access).select(:user_id).to_sql})"
]
if project.group
wheres << "id IN (#{project.group.members.where(['access_level > ?', Member::REPORTER]).select(:user_id).to_sql})"
wheres << "id IN (#{project.group.members.where(has_access).select(:user_id).to_sql})"
end
User.count_by_sql("SELECT COUNT(*) FROM users WHERE (#{wheres.join(' OR ')}) AND id NOT IN (#{approvals.select(:user_id).to_sql}) AND id != #{author.id}")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment