Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-10 06:10:01 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-10 06:10:01 +0300
commit9c03c1c545d1afeaf12d8ee1c204936cdf8c55e1 (patch)
treedd54368461117b3a32f48855402ba3d40ac909fe /app/workers
parentbc95576e2cbbd2def7a6fce1bde2d0263a3d7da1 (diff)
Make automerge via satellite
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/auto_merge_worker.rb13
1 files changed, 13 insertions, 0 deletions
diff --git a/app/workers/auto_merge_worker.rb b/app/workers/auto_merge_worker.rb
new file mode 100644
index 00000000000..a6dd73eee5f
--- /dev/null
+++ b/app/workers/auto_merge_worker.rb
@@ -0,0 +1,13 @@
+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