Move methods that are not related to mirroring to the repository model

1 files changed, 5 insertions, 19 deletions

diff --git a/app/models/concerns/repository_mirroring.rb b/app/models/concerns/repository_mirroring.rb
index 7aca3f72ae7..fed336c29d6 100644
--- a/app/models/concerns/repository_mirroring.rb
+++ b/app/models/concerns/repository_mirroring.rb
@@ -1,21 +1,4 @@
 module RepositoryMirroring
-  def storage_path
-    @project.repository_storage_path
-  end
-
-  def add_remote(name, url)
-    raw_repository.remote_add(name, url)
-  rescue Rugged::ConfigError
-    raw_repository.remote_update(name, url: url)
-  end
-
-  def remove_remote(name)
-    raw_repository.remote_delete(name)
-    true
-  rescue Rugged::ConfigError
-    false
-  end
-
   def set_remote_as_mirror(name)
     config = raw_repository.rugged.config
 
@@ -25,7 +8,10 @@ module RepositoryMirroring
     config["remote.#{name}.prune"] = true
   end
 
-  def fetch_remote(remote, forced: false, no_tags: false)
-    gitlab_shell.fetch_remote(storage_path, path_with_namespace, remote, forced: forced, no_tags: no_tags)
+  def fetch_mirror(remote, url)
+    add_remote(remote, url)
+    set_remote_as_mirror(remote)
+    fetch_remote(remote, forced: true)
+    remove_remote(remote)
   end
 end