Add latest changes from gitlab-org/gitlab@master

3 files changed, 15 insertions, 1 deletions

diff --git a/lib/feature/gitaly.rb b/lib/feature/gitaly.rb
index 852f4899b42..4f503377a77 100644
--- a/lib/feature/gitaly.rb
+++ b/lib/feature/gitaly.rb
@@ -10,6 +10,7 @@ class Feature
         inforef_uploadpack_cache
         get_all_lfs_pointers_go
         get_tag_messages_go
+        filter_shas_with_signatures_go
       ].freeze
 
     DEFAULT_ON_FLAGS = Set.new([]).freeze
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index 1aa2d6d0bcb..0c431c0a1de 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -173,7 +173,7 @@ module Gitlab
               @entries.delete(:type)
 
               # This is something of a hack, see issue for details:
-              # https://gitlab.com/gitlab-org/gitlab-foss/issues/67150
+              # https://gitlab.com/gitlab-org/gitlab/issues/31685
               if !only_defined? && has_rules?
                 @entries.delete(:only)
                 @entries.delete(:except)
diff --git a/lib/gitlab/diff/highlight_cache.rb b/lib/gitlab/diff/highlight_cache.rb
index 12a1db70b36..3d511b9a5b2 100644
--- a/lib/gitlab/diff/highlight_cache.rb
+++ b/lib/gitlab/diff/highlight_cache.rb
@@ -54,6 +54,15 @@ module Gitlab
 
       private
 
+      # We create a Gitlab::Diff::DeprecatedHighlightCache here in order to
+      #   expire deprecated cache entries while we make the transition. This can
+      #   be removed when :hset_redis_diff_caching is fully launched.
+      # See https://gitlab.com/gitlab-org/gitlab/issues/38008
+      #
+      def deprecated_cache
+        @deprecated_cache ||= Gitlab::Diff::DeprecatedHighlightCache.new(@diff_collection)
+      end
+
       def uncached_files
         diff_files = @diff_collection.diff_files
 
@@ -85,6 +94,10 @@ module Gitlab
             redis.expire(key, EXPIRATION)
           end
         end
+
+        # Clean up any deprecated hash entries
+        #
+        deprecated_cache.clear
       end
 
       def file_paths