summaryrefslogtreecommitdiff
path: root/lib/gitlab/merge_requests
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-03-15 15:09:10 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-03-15 15:09:10 +0000
commitcb7f766437db0c483adf3c128e35c64237a2ef53 (patch)
tree0b9bd9fdedad14dd065d14d9198ce080fbbeb8a5 /lib/gitlab/merge_requests
parent6a9ab27963fc1479fe7c78581b942c8dcce322e5 (diff)
downloadgitlab-ce-cb7f766437db0c483adf3c128e35c64237a2ef53.tar.gz
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.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/gitlab/merge_requests/commit_message_generator.rb b/lib/gitlab/merge_requests/commit_message_generator.rb
index 0515c17fe5d..ef5c63925c2 100644
--- a/lib/gitlab/merge_requests/commit_message_generator.rb
+++ b/lib/gitlab/merge_requests/commit_message_generator.rb
@@ -50,6 +50,19 @@ module Gitlab
.except(commit_author&.commit_email_or_default)
.map { |author_email, author_name| "Co-authored-by: #{author_name} <#{author_email}>" }
.join("\n")
+ end,
+ 'all_commits' => -> (merge_request, _, _) do
+ merge_request
+ .recent_commits
+ .without_merge_commits
+ .map do |commit|
+ if commit.safe_message&.bytesize&.>(100.kilobytes)
+ "* #{commit.title}\n\n-- Skipped commit body exceeding 100KiB in size."
+ else
+ "* #{commit.safe_message&.strip}"
+ end
+ end
+ .join("\n\n")
end
}.freeze