From 3e259ea8bc198b7a5c67bd1e03dc9d44c7dd5854 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 11 Aug 2015 14:33:31 +0200
Subject: Revert "Merge branch 'revert-satellites' into 'master'
"

This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing
changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
---
 app/workers/auto_merge_worker.rb        | 13 -------------
 app/workers/merge_worker.rb             | 19 +++++++++++++++++++
 app/workers/repository_import_worker.rb |  1 -
 3 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 100644 app/workers/auto_merge_worker.rb
 create mode 100644 app/workers/merge_worker.rb

(limited to 'app/workers')

diff --git a/app/workers/auto_merge_worker.rb b/app/workers/auto_merge_worker.rb
deleted file mode 100644
index a6dd73eee5f..00000000000
--- a/app/workers/auto_merge_worker.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class AutoMergeWorker
-  include Sidekiq::Worker
-
-  sidekiq_options queue: :default
-
-  def perform(merge_request_id, current_user_id, params)
-    params = params.with_indifferent_access
-    current_user = User.find(current_user_id)
-    merge_request = MergeRequest.find(merge_request_id)
-    merge_request.should_remove_source_branch = params[:should_remove_source_branch]
-    merge_request.automerge!(current_user, params[:commit_message])
-  end
-end
diff --git a/app/workers/merge_worker.rb b/app/workers/merge_worker.rb
new file mode 100644
index 00000000000..6a8665c179a
--- /dev/null
+++ b/app/workers/merge_worker.rb
@@ -0,0 +1,19 @@
+class MergeWorker
+  include Sidekiq::Worker
+
+  sidekiq_options queue: :default
+
+  def perform(merge_request_id, current_user_id, params)
+    params = params.with_indifferent_access
+    current_user = User.find(current_user_id)
+    merge_request = MergeRequest.find(merge_request_id)
+
+    result = MergeRequests::MergeService.new(merge_request.target_project, current_user).
+      execute(merge_request, params[:commit_message])
+
+    if result[:status] == :success && params[:should_remove_source_branch].present?
+      DeleteBranchService.new(merge_request.source_project, current_user).
+        execute(merge_request.source_branch)
+    end
+  end
+end
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index 94832872d13..b546f8777e1 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -27,7 +27,6 @@ class RepositoryImportWorker
 
     project.import_finish
     project.save
-    project.satellite.create unless project.satellite.exists?
     ProjectCacheWorker.perform_async(project.id)
     Gitlab::BitbucketImport::KeyDeleter.new(project).execute if project.import_type == 'bitbucket'
   end
-- 
cgit v1.2.3