summaryrefslogtreecommitdiff
path: root/app/models/key.rb
diff options
context:
space:
mode:
authorZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-15 19:13:26 +0100
committerZeger-Jan van de Weg <zegerjan@gitlab.com>2016-03-15 19:16:16 +0100
commit59064aeeef8562a87d4d03efa9b11012a007e261 (patch)
tree1ecb34e1355a4eb714615b2a9c2727155e8f3ec9 /app/models/key.rb
parentaaf4434b0e24da916d4392aa9cd001cdb8e0c7dc (diff)
parentbc590ce63bd2f1af5545b648e6d028a557e7c792 (diff)
downloadgitlab-ce-4009-external-users.tar.gz
Merge branch 'master' into 4009-external-users4009-external-users
Diffstat (limited to 'app/models/key.rb')
-rw-r--r--app/models/key.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/key.rb b/app/models/key.rb
index 406a1257b5d..0282ad18139 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -16,6 +16,7 @@
require 'digest/md5'
class Key < ActiveRecord::Base
+ include AfterCommitQueue
include Sortable
belongs_to :user
@@ -62,7 +63,7 @@ class Key < ActiveRecord::Base
end
def notify_user
- NotificationService.new.new_key(self)
+ run_after_commit { NotificationService.new.new_key(self) }
end
def post_create_hook