Remove satellites

6 files changed, 7 insertions, 30 deletions

diff --git a/app/services/compare_service.rb b/app/services/compare_service.rb
index 6aa9df4b194..48ad7fab4e6 100644
--- a/app/services/compare_service.rb
+++ b/app/services/compare_service.rb
@@ -3,9 +3,6 @@
 class CompareService
   def execute(current_user, source_project, source_branch, target_project, target_branch)
     # Try to compare branches to get commits list and diffs
-    #
-    # Note: Use satellite only when need to compare between two repos
-    # because satellites are slower than operations on bare repo
     if target_project == source_project
       Gitlab::CompareResult.new(
         Gitlab::Git::Compare.new(
@@ -15,13 +12,7 @@ class CompareService
         )
       )
     else
-      Gitlab::Satellite::CompareAction.new(
-        current_user,
-        target_project,
-        target_branch,
-        source_project,
-        source_branch
-      ).result
+      raise 'Implement me'
     end
   end
 end
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 6135ae65007..3a5a52e6f55 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -10,16 +10,14 @@ class GitPushService
   #
   # Next, this method:
   #  1. Creates the push event
-  #  2. Ensures that the project satellite exists
-  #  3. Updates merge requests
-  #  4. Recognizes cross-references from commit messages
-  #  5. Executes the project's web hooks
-  #  6. Executes the project's services
+  #  2. Updates merge requests
+  #  3. Recognizes cross-references from commit messages
+  #  4. Executes the project's web hooks
+  #  5. Executes the project's services
   #
   def execute(project, user, oldrev, newrev, ref)
     @project, @user = project, user
 
-    project.ensure_satellite_exists
     project.repository.expire_cache
     project.update_repository_size
 
diff --git a/app/services/merge_requests/auto_merge_service.rb b/app/services/merge_requests/auto_merge_service.rb
index df793fc997d..1c41148d41d 100644
--- a/app/services/merge_requests/auto_merge_service.rb
+++ b/app/services/merge_requests/auto_merge_service.rb
@@ -1,7 +1,7 @@
 module MergeRequests
   # AutoMergeService class
   #
-  # Do git merge in satellite and in case of success
+  # Do git merge and in case of success
   # mark merge request as merged and execute all hooks and notifications
   # Called when you do merge via GitLab UI
   class AutoMergeService < BaseMergeService
@@ -32,9 +32,8 @@ module MergeRequests
 
     def merge!
       if merge_request.for_fork?
-        Gitlab::Satellite::MergeAction.new(current_user, merge_request).merge!(commit_message)
+        raise 'Implement me'
       else
-        # Merge local branches using rugged instead of satellites
         if sha = commit
           after_commit(sha, merge_request.target_branch)
         end
diff --git a/app/services/merge_requests/build_service.rb b/app/services/merge_requests/build_service.rb
index 956480938c3..5ef1cd2caa0 100644
--- a/app/services/merge_requests/build_service.rb
+++ b/app/services/merge_requests/build_service.rb
@@ -40,7 +40,6 @@ module MergeRequests
           merge_request.compare_diffs = diffs
 
         elsif diffs == false
-          # satellite timeout return false
           merge_request.can_be_created = false
           merge_request.compare_failed = true
         end
@@ -59,9 +58,6 @@ module MergeRequests
       end
 
       merge_request
-
-    rescue Gitlab::Satellite::BranchesWithoutParent
-      return build_failed(merge_request, "Selected branches have no common commit so they cannot be merged.")
     end
 
     def build_failed(merge_request, message)
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index 403f419ec50..28872c89259 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -27,7 +27,6 @@ module Projects
         end
       end
 
-      project.satellite.destroy
       log_info("Project \"#{project.name}\" was removed")
       system_hook_service.execute_hooks_for(project, :destroy)
       true
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index f43c0ef70e9..550ed6897dd 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -33,9 +33,6 @@ module Projects
           raise TransferError.new("Project with same path in target namespace already exists")
         end
 
-        # Remove old satellite
-        project.satellite.destroy
-
         # Apply new namespace id
         project.namespace = new_namespace
         project.save!
@@ -51,9 +48,6 @@ module Projects
         # Move wiki repo also if present
         gitlab_shell.mv_repository("#{old_path}.wiki", "#{new_path}.wiki")
 
-        # Create a new satellite (reload project from DB)
-        Project.find(project.id).ensure_satellite_exists
-
         # clear project cached events
         project.reset_events_cache