diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-09 18:21:49 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-09 18:21:49 +0200 |
| commit | 66ecfa77e5105c8a8151db899e3d3a09dba3024e (patch) | |
| tree | c8780c4bfcb5135dfc465f2f0d03424501ed3382 /app/models | |
| parent | 7bfd38eaa95988accfc6bb09759d7688126f5692 (diff) | |
| parent | 9773ccc4519c4c35f969248c4e0f13689b631760 (diff) | |
| download | gitlab-ce-66ecfa77e5105c8a8151db899e3d3a09dba3024e.tar.gz | |
Merge branch 'sidekiq'
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/models/system_hook.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 702f4b2bf81..32b951349a9 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -251,7 +251,7 @@ class Project < ActiveRecord::Base def send_move_instructions self.users_projects.each do |member| - Notify.project_was_moved_email(member.id).deliver + Notify.delay.project_was_moved_email(member.id) end end diff --git a/app/models/system_hook.rb b/app/models/system_hook.rb index 2ae5b1314e9..5f1bd6477c4 100644 --- a/app/models/system_hook.rb +++ b/app/models/system_hook.rb @@ -19,6 +19,6 @@ class SystemHook < WebHook end def async_execute(data) - Resque.enqueue(SystemHookWorker, id, data) + Sidekiq::Client.enqueue(SystemHookWorker, id, data) end end |