diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2019-03-19 13:58:08 +0300 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2019-03-19 14:00:05 +0300 |
| commit | ade207e575ab846f6d354aaccc1382a6e512dd0d (patch) | |
| tree | 6cbb8f04284211ab7a811e9cbfc610ee69be5950 /app/models/merge_request.rb | |
| parent | b53376592491cf2016fe68fecaf5f090cf4627b4 (diff) | |
| download | gitlab-ce-ade207e575ab846f6d354aaccc1382a6e512dd0d.tar.gz | |
Backport splitting approval changes from CE
Author and committers approvals are split in EE
This commit provides backports for those changes
This reverts commit 886f00bcba23d67e2c86591c2eb5359ef457a2f9.
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index aeb6acf0ac0..ea9c29daafc 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -312,12 +312,8 @@ class MergeRequest < ActiveRecord::Base work_in_progress?(title) ? title : "WIP: #{title}" end - def commit_authors - @commit_authors ||= commits.authors - end - - def authors - User.from_union([commit_authors, User.where(id: self.author_id)]) + def committers + @committers ||= commits.committers end # Verifies if title has changed not taking into account WIP prefix |