Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

3 files changed, 20 insertions, 3 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
 
diff --git a/lib/gitlab/merge_requests/mergeability/check_result.rb b/lib/gitlab/merge_requests/mergeability/check_result.rb
index d0788c7d7c7..5284d20d423 100644
--- a/lib/gitlab/merge_requests/mergeability/check_result.rb
+++ b/lib/gitlab/merge_requests/mergeability/check_result.rb
@@ -22,8 +22,8 @@ module Gitlab
 
         def self.from_hash(data)
           new(
-            status: data.fetch(:status),
-            payload: data.fetch(:payload))
+            status: data.fetch('status').to_sym,
+            payload: data.fetch('payload'))
         end
 
         def initialize(status:, payload: {})
diff --git a/lib/gitlab/merge_requests/mergeability/results_store.rb b/lib/gitlab/merge_requests/mergeability/results_store.rb
index bb6489f8526..2f7b8888b2f 100644
--- a/lib/gitlab/merge_requests/mergeability/results_store.rb
+++ b/lib/gitlab/merge_requests/mergeability/results_store.rb
@@ -9,7 +9,11 @@ module Gitlab
         end
 
         def read(merge_check:)
-          interface.retrieve_check(merge_check: merge_check)
+          result_hash = interface.retrieve_check(merge_check: merge_check)
+
+          return if result_hash.blank?
+
+          CheckResult.from_hash(result_hash)
         end
 
         def write(merge_check:, result_hash:)