diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-20 15:06:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-20 15:06:01 +0300 |
commit | a68e9d3318c6847436f81f83eb347b29f52d1bff (patch) | |
tree | 511a790297f7e771f8d73025b9a1f9b4a0586d71 /app/models/merge_request.rb | |
parent | 7bc0aff0b4e15fce828621d7e0919d84368f3d2b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
-rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 399fc030d24..a40eaa34bd1 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1066,7 +1066,7 @@ class MergeRequest < ApplicationRecord # Returns the oldest multi-line commit message, or the MR title if none found def default_squash_commit_message strong_memoize(:default_squash_commit_message) do - commits.without_merge_commits.reverse.find(&:description?)&.safe_message || title + recent_commits.without_merge_commits.reverse_each.find(&:description?)&.safe_message || title end end |