Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-12-08 15:13:04 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-12-08 15:13:04 +0300
commit886ecba0bd2d964504b43303a39cfa2386f0feed (patch)
treee814b9f24f3df16bc1a8c8725a168fac3844d719 /lib/gitlab/merge_requests
parentcb09086128f2923126d009a88b478ff3919c8309 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/merge_requests')
-rw-r--r--lib/gitlab/merge_requests/commit_message_generator.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/merge_requests/commit_message_generator.rb b/lib/gitlab/merge_requests/commit_message_generator.rb
index c420385b7c1..0e9ec6f5cb3 100644
--- a/lib/gitlab/merge_requests/commit_message_generator.rb
+++ b/lib/gitlab/merge_requests/commit_message_generator.rb
@@ -35,7 +35,9 @@ module Gitlab
"Closes #{closes_issues_references.to_sentence}"
end,
'description' => ->(merge_request) { merge_request.description.presence || '' },
- 'reference' => ->(merge_request) { merge_request.to_reference(full: true) }
+ 'reference' => ->(merge_request) { merge_request.to_reference(full: true) },
+ 'first_commit' => -> (merge_request) { merge_request.first_commit&.safe_message&.strip.presence || '' },
+ 'first_multiline_commit' => -> (merge_request) { merge_request.first_multiline_commit&.safe_message&.strip.presence || merge_request.title }
}.freeze
PLACEHOLDERS_REGEX = Regexp.union(PLACEHOLDERS.keys.map do |key|