diff options
author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-06 17:15:44 -0500 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-10-06 17:15:44 -0500 |
commit | 02838d5be2f899793ce5e026f0bb20c509697061 (patch) | |
tree | de3e125ca3f997bb94e079e2d2dbdc879d3dd7c6 /app/services/emails/base_service.rb | |
parent | 035bf5d4d5d3209286aa257cbd56ec6ce9e1afb9 (diff) | |
parent | 3cbab382f678cef273cde319aae55f050d27527d (diff) | |
download | gitlab-ce-02838d5be2f899793ce5e026f0bb20c509697061.tar.gz |
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'app/services/emails/base_service.rb')
-rw-r--r-- | app/services/emails/base_service.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/app/services/emails/base_service.rb b/app/services/emails/base_service.rb index 7f591c89411..5bbceeb3b3f 100644 --- a/app/services/emails/base_service.rb +++ b/app/services/emails/base_service.rb @@ -1,9 +1,8 @@ module Emails class BaseService - def initialize(current_user, opts) - @current_user = current_user - @user = opts.delete(:user) - @email = opts[:email] + def initialize(current_user, params = {}) + @current_user, @params = current_user, params.dup + @user = params.delete(:user) end end end |