Add latest changes from gitlab-org/gitlab@13-1-stable-ee

3 files changed, 16 insertions, 6 deletions

diff --git a/lib/gitlab/git/commit.rb b/lib/gitlab/git/commit.rb
index a554dc0b667..17d0a62ba8c 100644
--- a/lib/gitlab/git/commit.rb
+++ b/lib/gitlab/git/commit.rb
@@ -7,6 +7,7 @@ module Gitlab
       include Gitlab::EncodingHelper
       prepend Gitlab::Git::RuggedImpl::Commit
       extend Gitlab::Git::WrapsGitalyErrors
+      include Gitlab::Utils::StrongMemoize
 
       attr_accessor :raw_commit, :head
 
@@ -231,6 +232,18 @@ module Gitlab
         parent_ids.first
       end
 
+      def committed_date
+        strong_memoize(:committed_date) do
+          init_date_from_gitaly(raw_commit.committer) if raw_commit
+        end
+      end
+
+      def authored_date
+        strong_memoize(:authored_date) do
+          init_date_from_gitaly(raw_commit.author) if raw_commit
+        end
+      end
+
       # Returns a diff object for the changes from this commit's first parent.
       # If there is no parent, then the diff is between this commit and an
       # empty repo. See Repository#diff for keys allowed in the +options+
@@ -369,11 +382,9 @@ module Gitlab
         # subject from the message to make it clearer when there's one
         # available but not the other.
         @message = message_from_gitaly_body
-        @authored_date = init_date_from_gitaly(commit.author)
         @author_name = commit.author.name.dup
         @author_email = commit.author.email.dup
 
-        @committed_date = init_date_from_gitaly(commit.committer)
         @committer_name = commit.committer.name.dup
         @committer_email = commit.committer.email.dup
         @parent_ids = Array(commit.parent_ids)
diff --git a/lib/gitlab/git/diff.rb b/lib/gitlab/git/diff.rb
index 74a4633424f..bb845f11181 100644
--- a/lib/gitlab/git/diff.rb
+++ b/lib/gitlab/git/diff.rb
@@ -225,7 +225,7 @@ module Gitlab
       end
 
       def init_from_gitaly(diff)
-        @diff = encode!(diff.patch) if diff.respond_to?(:patch)
+        @diff = diff.respond_to?(:patch) ? encode!(diff.patch) : ''
         @new_path = encode!(diff.to_path.dup)
         @old_path = encode!(diff.from_path.dup)
         @a_mode = diff.old_mode.to_s(8)
diff --git a/lib/gitlab/git/rugged_impl/use_rugged.rb b/lib/gitlab/git/rugged_impl/use_rugged.rb
index f9573bedba7..dae208e6955 100644
--- a/lib/gitlab/git/rugged_impl/use_rugged.rb
+++ b/lib/gitlab/git/rugged_impl/use_rugged.rb
@@ -5,8 +5,7 @@ module Gitlab
     module RuggedImpl
       module UseRugged
         def use_rugged?(repo, feature_key)
-          feature = Feature.get(feature_key)
-          return feature.enabled? if Feature.persisted?(feature)
+          return Feature.enabled?(feature_key) if Feature.persisted_name?(feature_key)
 
           # Disable Rugged auto-detect(can_use_disk?) when Puma threads>1
           # https://gitlab.com/gitlab-org/gitlab/issues/119326
@@ -25,7 +24,7 @@ module Gitlab
 
             if Gitlab::RuggedInstrumentation.active?
               Gitlab::RuggedInstrumentation.increment_query_count
-              Gitlab::RuggedInstrumentation.query_time += duration
+              Gitlab::RuggedInstrumentation.add_query_time(duration)
 
               Gitlab::RuggedInstrumentation.add_call_details(
                 feature: method_name,