diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-02-15 17:17:27 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-02-15 17:17:27 +0000 |
| commit | 8f209ed5eac176fde0272ced69e36467e37fe79a (patch) | |
| tree | 04df23046c266bda90daa560ce22334e6789b615 /app/models/merge_request.rb | |
| parent | fffce276f128ecf4267886c4706ad5e81d33d61d (diff) | |
| parent | 886f00bcba23d67e2c86591c2eb5359ef457a2f9 (diff) | |
| download | gitlab-ce-8f209ed5eac176fde0272ced69e36467e37fe79a.tar.gz | |
Merge branch 'sh-fix-issue-9787-ce' into 'master'
Backport commit author changes from CE
See merge request gitlab-org/gitlab-ce!25294
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 790555ab045..75fca96ce0a 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -286,12 +286,12 @@ class MergeRequest < ActiveRecord::Base work_in_progress?(title) ? title : "WIP: #{title}" end - def committers - @committers ||= commits.committers + def commit_authors + @commit_authors ||= commits.authors end def authors - User.from_union([committers, User.where(id: self.author_id)]) + User.from_union([commit_authors, User.where(id: self.author_id)]) end # Verifies if title has changed not taking into account WIP prefix |