Add latest changes from gitlab-org/gitlab@master

4 files changed, 38 insertions, 4 deletions

diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 4ea618f063b..b2c22898079 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -131,6 +131,18 @@ module Gitlab
         end
       end
 
+      def rename(new_relative_path)
+        wrapped_gitaly_errors do
+          gitaly_repository_client.rename(new_relative_path)
+        end
+      end
+
+      def remove
+        wrapped_gitaly_errors do
+          gitaly_repository_client.remove
+        end
+      end
+
       def expire_has_local_branches_cache
         clear_memoization(:has_local_branches)
       end
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index c4eb3ad770a..befcc004ee4 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -365,7 +365,7 @@ module Gitlab
       if Sidekiq.server?
         6.hours
       else
-        55.seconds
+        default_timeout
       end
     end
 
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb
index ee5cb519a72..d0e5e0db830 100644
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
@@ -347,6 +347,18 @@ module Gitlab
         GitalyClient.call(@storage, :object_pool_service, :disconnect_git_alternates, request, timeout: GitalyClient.long_timeout)
       end
 
+      def rename(relative_path)
+        request = Gitaly::RenameRepositoryRequest.new(repository: @gitaly_repo, relative_path: relative_path)
+
+        GitalyClient.call(@storage, :repository_service, :rename_repository, request, timeout: GitalyClient.fast_timeout)
+      end
+
+      def remove
+        request = Gitaly::RemoveRepositoryRequest.new(repository: @gitaly_repo)
+
+        GitalyClient.call(@storage, :repository_service, :remove_repository, request, timeout: GitalyClient.long_timeout)
+      end
+
       private
 
       def search_results_from_response(gitaly_response)
diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb
index 7dbed591b84..ec9b2a2022e 100644
--- a/lib/gitlab/shell.rb
+++ b/lib/gitlab/shell.rb
@@ -126,7 +126,13 @@ module Gitlab
     def mv_repository(storage, path, new_path)
       return false if path.empty? || new_path.empty?
 
-      !!mv_directory(storage, "#{path}.git", "#{new_path}.git")
+      Gitlab::Git::Repository.new(storage, "#{path}.git", nil, nil).rename("#{new_path}.git")
+
+      true
+    rescue => e
+      Gitlab::Sentry.track_acceptable_exception(e, extra: { path: path, new_path: new_path, storage: storage })
+
+      false
     end
 
     # Fork repository to new path
@@ -151,9 +157,13 @@ module Gitlab
     def remove_repository(storage, name)
       return false if name.empty?
 
-      !!rm_directory(storage, "#{name}.git")
-    rescue ArgumentError => e
+      Gitlab::Git::Repository.new(storage, "#{name}.git", nil, nil).remove
+
+      true
+    rescue => e
       Rails.logger.warn("Repository does not exist: #{e} at: #{name}.git") # rubocop:disable Gitlab/RailsLogger
+      Gitlab::Sentry.track_acceptable_exception(e, extra: { path: name, storage: storage })
+
       false
     end