Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

5 files changed, 10 insertions, 2 deletions

diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb
index 0bc7ecccf5e..35c3dc5b0b3 100644
--- a/lib/gitlab/git/commit.rb
+++ b/lib/gitlab/git/commit.rb
@@ -16,7 +16,7 @@ module Gitlab
       SERIALIZE_KEYS = [
         :id, :message, :parent_ids,
         :authored_date, :author_name, :author_email,
-        :committed_date, :committer_name, :committer_email
+        :committed_date, :committer_name, :committer_email, :trailers
       ].freeze
 
       attr_accessor(*SERIALIZE_KEYS)
@@ -389,6 +389,7 @@ module Gitlab
         @committer_name = commit.committer.name.dup
         @committer_email = commit.committer.email.dup
         @parent_ids = Array(commit.parent_ids)
+        @trailers = Hash[commit.trailers.map { |t| [t.key, t.value] }]
       end
 
       # Gitaly provides a UNIX timestamp in author.date.seconds, and a timezone
diff --git a/lib/gitlab/git/diff.rb b/lib/gitlab/git/diff.rb
index 209917073c7..53df0b7b389 100644
--- a/lib/gitlab/git/diff.rb
+++ b/lib/gitlab/git/diff.rb
@@ -244,6 +244,8 @@ module Gitlab
 
       def prune_diff_if_eligible
         if too_large?
+          ::Gitlab::Metrics.add_event(:patch_hard_limit_bytes_hit)
+
           too_large!
         elsif collapsed?
           collapse!
diff --git a/lib/gitlab/git/push.rb b/lib/gitlab/git/push.rb
index b6577ba17f1..3d533a5185f 100644
--- a/lib/gitlab/git/push.rb
+++ b/lib/gitlab/git/push.rb
@@ -33,7 +33,9 @@ module Gitlab
       end
 
       def force_push?
-        Gitlab::Checks::ForcePush.force_push?(@project, @oldrev, @newrev)
+        strong_memoize(:force_push) do
+          Gitlab::Checks::ForcePush.force_push?(@project, @oldrev, @newrev)
+        end
       end
 
       def branch_push?
diff --git a/lib/gitlab/git/rugged_impl/commit.rb b/lib/gitlab/git/rugged_impl/commit.rb
index 0eff35ab1c4..0607b151de2 100644
--- a/lib/gitlab/git/rugged_impl/commit.rb
+++ b/lib/gitlab/git/rugged_impl/commit.rb
@@ -103,6 +103,7 @@ module Gitlab
           @committer_name = committer[:name]
           @committer_email = committer[:email]
           @parent_ids = commit.parents.map(&:oid)
+          @trailers = Hash[commit.trailers]
         end
       end
     end
diff --git a/lib/gitlab/git/wiki.rb b/lib/gitlab/git/wiki.rb
index 11919be594d..55ff3c6caf1 100644
--- a/lib/gitlab/git/wiki.rb
+++ b/lib/gitlab/git/wiki.rb
@@ -151,6 +151,8 @@ module Gitlab
       end
 
       def gitaly_find_page(title:, version: nil, dir: nil)
+        return unless title.present?
+
         wiki_page, version = gitaly_wiki_client.find_page(title: title, version: version, dir: dir)
         return unless wiki_page