diff options
author | Rémy Coutable <remy@rymai.me> | 2018-10-02 14:51:10 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-10-02 14:51:10 +0000 |
commit | d5184e0d8b48bc221e1ea401b9171db07959b50c (patch) | |
tree | 35f6cdb735ce144e14c2db30ab9eae10602b5a79 | |
parent | 5837f8c4e93495a626824081d94154026ce20d88 (diff) | |
parent | c50fc090a5cc44304b14b0509c7e111d342b3bdc (diff) | |
download | gitlab-ce-d5184e0d8b48bc221e1ea401b9171db07959b50c.tar.gz |
Merge branch 'ce-5382-approvers-from-code-owners' into 'master'
[Backport] Suggest approvers based on code owners
See merge request gitlab-org/gitlab-ce!21918
-rw-r--r-- | app/models/project.rb | 12 | ||||
-rw-r--r-- | spec/models/project_spec.rb | 43 |
2 files changed, 55 insertions, 0 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 503fbc30768..59f088156c7 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1365,6 +1365,18 @@ class Project < ActiveRecord::Base end end + # Filters `users` to return only authorized users of the project + def members_among(users) + if users.is_a?(ActiveRecord::Relation) && !users.loaded? + authorized_users.merge(users) + else + return [] if users.empty? + + user_ids = authorized_users.where(users: { id: users.map(&:id) }).pluck(:id) + users.select { |user| user_ids.include?(user.id) } + end + end + def default_branch @default_branch ||= repository.root_ref if repository.exists? end diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index afc9ea1917e..d15ba89efb5 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -3995,6 +3995,49 @@ describe Project do end end + context '#members_among' do + let(:users) { create_list(:user, 3) } + set(:group) { create(:group) } + set(:project) { create(:project, namespace: group) } + + before do + project.add_guest(users.first) + project.group.add_maintainer(users.last) + end + + context 'when users is an Array' do + it 'returns project members among the users' do + expect(project.members_among(users)).to eq([users.first, users.last]) + end + + it 'maintains input order' do + expect(project.members_among(users.reverse)).to eq([users.last, users.first]) + end + + it 'returns empty array if users is empty' do + result = project.members_among([]) + + expect(result).to be_empty + end + end + + context 'when users is a relation' do + it 'returns project members among the users' do + result = project.members_among(User.where(id: users.map(&:id))) + + expect(result).to be_a(ActiveRecord::Relation) + expect(result).to eq([users.first, users.last]) + end + + it 'returns empty relation if users is empty' do + result = project.members_among(User.none) + + expect(result).to be_a(ActiveRecord::Relation) + expect(result).to be_empty + end + end + end + def rugged_config Gitlab::GitalyClient::StorageSettings.allow_disk_access do project.repository.rugged.config |