diff options
| author | Igor <idrozdov@gitlab.com> | 2019-04-02 14:01:07 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-04-02 14:01:07 +0300 |
| commit | 351b39f172bf77f4eb0e84fb2e5a71af9fe72348 (patch) | |
| tree | 6ae773097df4469714b0e2e5a7893f760d174f3f /app/models/merge_request.rb | |
| parent | f21f93f904505a5c5041a2e0f040fdad7107d3df (diff) | |
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 50e6391a700..b780b67492f 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -323,12 +323,8 @@ class MergeRequest < ApplicationRecord 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 |