summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2017-09-20 12:00:33 +0200
committerJames Lopez <james@jameslopez.es>2017-09-28 08:46:39 +0200
commit7188975cb54a2b6902544340a91f94aa1fa82d3c (patch)
tree1875e2d2aa970686280f7e40d67a21dd7dd76f1e
parent9621dd0c9d31508bdac2e2e226537302b560ef10 (diff)
downloadgitlab-ce-7188975cb54a2b6902544340a91f94aa1fa82d3c.tar.gz
update initializers
-rw-r--r--app/services/emails/base_service.rb3
-rw-r--r--app/services/users/update_service.rb3
2 files changed, 4 insertions, 2 deletions
diff --git a/app/services/emails/base_service.rb b/app/services/emails/base_service.rb
index ace49889097..8810f6d8803 100644
--- a/app/services/emails/base_service.rb
+++ b/app/services/emails/base_service.rb
@@ -1,6 +1,7 @@
module Emails
class BaseService
- def initialize(user, opts)
+ def initialize(current_user, user, opts)
+ @current_user = current_user
@user = user
@email = opts[:email]
end
diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb
index fddeeb9d52a..05cb1655325 100644
--- a/app/services/users/update_service.rb
+++ b/app/services/users/update_service.rb
@@ -2,7 +2,8 @@ module Users
class UpdateService < BaseService
include NewUserNotifier
- def initialize(user, params = {})
+ def initialize(current_user, user, params = {})
+ @current_user = current_user
@user = user
@params = params.dup
end