diff options
| author | ashleyhull-versent <ashley.hull@versent.com.au> | 2018-10-08 13:50:11 +1100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-10-08 04:50:11 +0200 |
| commit | f194857ac9eeb85f9b27c056c556038aee23cb43 (patch) | |
| tree | fa6f5dd3df450849f85924b7abbfdb40f73f036b /app/models/concerns | |
| parent | a00ce8c92c06f42109aad5cfe65d46862cf037bb (diff) | |
rubocop issues - Cleaning up (#8912)
* cleanup pass * undo mistakes * fixed. * revert
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/omniauthable.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb index 50288e700..f263fe7af 100644 --- a/app/models/concerns/omniauthable.rb +++ b/app/models/concerns/omniauthable.rb @@ -26,7 +26,7 @@ module Omniauthable # to prevent the identity being locked with accidentally created accounts. # Note that this may leave zombie accounts (with no associated identity) which # can be cleaned up at a later date. - user = signed_in_resource ? signed_in_resource : identity.user + user = signed_in_resource || identity.user user = create_for_oauth(auth) if user.nil? if identity.user.nil? @@ -61,7 +61,7 @@ module Omniauthable display_name = auth.info.full_name || [auth.info.first_name, auth.info.last_name].join(' ') { - email: email ? email : "#{TEMP_EMAIL_PREFIX}-#{auth.uid}-#{auth.provider}.com", + email: email || "#{TEMP_EMAIL_PREFIX}-#{auth.uid}-#{auth.provider}.com", password: Devise.friendly_token[0, 20], account_attributes: { username: ensure_unique_username(auth.uid), |