Add latest changes from gitlab-org/gitlab@16-1-stable-eev16.1.0-rc42

2 files changed, 19 insertions, 2 deletions

diff --git a/app/services/concerns/search/filter.rb b/app/services/concerns/search/filter.rb
new file mode 100644
index 00000000000..e234edcfce4
--- /dev/null
+++ b/app/services/concerns/search/filter.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Search
+  module Filter
+    private
+
+    def filters
+      { state: params[:state], confidential: params[:confidential], include_archived: params[:include_archived] }
+    end
+  end
+end
+
+Search::Filter.prepend_mod
diff --git a/app/services/concerns/update_repository_storage_methods.rb b/app/services/concerns/update_repository_storage_methods.rb
index a0b4040cff7..bb43cab79bb 100644
--- a/app/services/concerns/update_repository_storage_methods.rb
+++ b/app/services/concerns/update_repository_storage_methods.rb
@@ -14,12 +14,16 @@ module UpdateRepositoryStorageMethods
   end
 
   def execute
-    repository_storage_move.with_lock do
-      return ServiceResponse.success unless repository_storage_move.scheduled? # rubocop:disable Cop/AvoidReturnFromBlocks
+    response = repository_storage_move.with_lock do
+      next ServiceResponse.success unless repository_storage_move.scheduled?
 
       repository_storage_move.start!
+
+      nil
     end
 
+    return response if response
+
     mirror_repositories unless same_filesystem?
 
     repository_storage_move.transaction do