diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-03-24 10:53:50 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-03-24 10:53:50 +0100 |
| commit | f60c99a8fb0c99554fce091cac61d9ed07eef573 (patch) | |
| tree | 27457a4e091b820269daedb2f709ca304bcf5d06 /app/models/concerns | |
| parent | d7c1c41859549212a6d34ad869fded16acc17b48 (diff) | |
| parent | 88d69d3261c2f02278d07dc302ff7fc15bd68e8c (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/account_interactions.rb | 2 | ||||
| -rw-r--r-- | app/models/concerns/omniauthable.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/models/concerns/account_interactions.rb b/app/models/concerns/account_interactions.rb index 974f57820..51e8e04a8 100644 --- a/app/models/concerns/account_interactions.rb +++ b/app/models/concerns/account_interactions.rb @@ -67,7 +67,7 @@ module AccountInteractions private def follow_mapping(query, field) - query.pluck(field).each_with_object({}) { |id, mapping| mapping[id] = true } + query.pluck(field).index_with(true) end end diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb index 79d671d10..791a94911 100644 --- a/app/models/concerns/omniauthable.rb +++ b/app/models/concerns/omniauthable.rb @@ -68,7 +68,6 @@ module Omniauthable def user_params_from_auth(email, auth) { email: email || "#{TEMP_EMAIL_PREFIX}-#{auth.uid}-#{auth.provider}.com", - password: Devise.friendly_token[0, 20], agreement: true, external: true, account_attributes: { |