diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-06-01 16:36:04 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-06-02 11:43:32 -0500 |
commit | e4eac1fff1ba6d890f9f028dbfe47918b7876688 (patch) | |
tree | f4f08e065ca769e34c0e2139765b268c192260d2 /app/models/key.rb | |
parent | a9dbda8605f2c3111c4e4775edf7f931e4260a41 (diff) | |
download | gitlab-ce-e4eac1fff1ba6d890f9f028dbfe47918b7876688.tar.gz |
Don’t schedule workers from inside transactions
Diffstat (limited to 'app/models/key.rb')
-rw-r--r-- | app/models/key.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/models/key.rb b/app/models/key.rb index b7956052c3f..cb8f10f6d55 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -1,7 +1,6 @@ require 'digest/md5' class Key < ActiveRecord::Base - include AfterCommitQueue include Sortable LAST_USED_AT_REFRESH_TIME = 1.day.to_i @@ -25,10 +24,10 @@ class Key < ActiveRecord::Base delegate :name, :email, to: :user, prefix: true - after_create :add_to_shell - after_create :notify_user + after_commit :add_to_shell, on: :create + after_commit :notify_user, on: :create after_create :post_create_hook - after_destroy :remove_from_shell + after_commit :remove_from_shell, on: :destroy after_destroy :post_destroy_hook def key=(value) @@ -93,6 +92,6 @@ class Key < ActiveRecord::Base end def notify_user - run_after_commit { NotificationService.new.new_key(self) } + NotificationService.new.new_key(self) end end |