Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/feature.rb b/lib/feature.rb
index 37cbe33f7c9..60a5c03a839 100644
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -38,7 +38,7 @@ class Feature
         begin
           # We saw on GitLab.com, this database request was called 2300
           # times/s. Let's cache it for a minute to avoid that load.
-          Gitlab::ThreadMemoryCache.cache_backend.fetch('flipper:persisted_names', expires_in: 1.minute) do
+          Gitlab::ProcessMemoryCache.cache_backend.fetch('flipper:persisted_names', expires_in: 1.minute) do
             FlipperFeature.feature_names
           end
         end
diff --git a/lib/gitlab/checks/diff_check.rb b/lib/gitlab/checks/diff_check.rb
index 0eb2b4c79ef..a73f243e946 100644
--- a/lib/gitlab/checks/diff_check.rb
+++ b/lib/gitlab/checks/diff_check.rb
@@ -21,7 +21,7 @@ module Gitlab
         process_commits do |commit|
           validate_once(commit) do
             commit.raw_deltas.each do |diff|
-              file_paths << (diff.new_path || diff.old_path)
+              file_paths.concat([diff.new_path, diff.old_path].compact)
 
               validate_diff(diff)
             end