summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-28 21:02:10 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-28 21:02:10 +0200
commit299a9a10400e7fdcc641a90db95290322058c529 (patch)
tree3e522bc19287e19c1729104f2827cc240ad64c5d /app
parent944b2450b1eb08f3d7fcbfce2cf2ac5ef5544808 (diff)
downloadgitlab-ce-299a9a10400e7fdcc641a90db95290322058c529.tar.gz
keys to gitolite via sidekiq now
Diffstat (limited to 'app')
-rw-r--r--app/observers/key_observer.rb14
-rw-r--r--app/workers/gitolite_worker.rb4
2 files changed, 14 insertions, 4 deletions
diff --git a/app/observers/key_observer.rb b/app/observers/key_observer.rb
index bf5fa647647..44e78643d83 100644
--- a/app/observers/key_observer.rb
+++ b/app/observers/key_observer.rb
@@ -2,11 +2,21 @@ class KeyObserver < ActiveRecord::Observer
include Gitolited
def after_save(key)
- gitolite.set_key(key.identifier, key.key, key.projects)
+ GitoliteWorker.perform_async(
+ :set_key,
+ key.identifier,
+ key.key,
+ key.projects.map(&:id)
+ )
end
def after_destroy(key)
return if key.is_deploy_key && !key.last_deploy?
- gitolite.remove_key(key.identifier, key.projects)
+
+ GitoliteWorker.perform_async(
+ :remove_key,
+ key.identifier,
+ key.projects.map(&:id)
+ )
end
end
diff --git a/app/workers/gitolite_worker.rb b/app/workers/gitolite_worker.rb
index d134ea035f4..bff7a8c6a6f 100644
--- a/app/workers/gitolite_worker.rb
+++ b/app/workers/gitolite_worker.rb
@@ -4,7 +4,7 @@ class GitoliteWorker
sidekiq_options queue: :gitolite
- def perform(action, arg)
- gitolite.send(action, arg)
+ def perform(action, *arg)
+ gitolite.send(action, *arg)
end
end