diff options
| author | Reverite <github@reverite.sh> | 2019-07-23 20:54:15 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-23 20:54:15 -0700 |
| commit | fee3abd1dce8f437e3514cb03816ae50862b3c4c (patch) | |
| tree | 72e19e9e748edce7024737cfb70f9088346058bd /app/models/concerns | |
| parent | 9148c3e8479e59df9f9a4889ef58a959f60f6606 (diff) | |
| parent | 08325db62bcc4d5d530513c615bc1c733f166239 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/account_associations.rb | 3 | ||||
| -rw-r--r-- | app/models/concerns/omniauthable.rb | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/models/concerns/account_associations.rb b/app/models/concerns/account_associations.rb index 2877b9c25..f76cf305f 100644 --- a/app/models/concerns/account_associations.rb +++ b/app/models/concerns/account_associations.rb @@ -31,9 +31,6 @@ module AccountAssociations has_many :media_attachments, dependent: :destroy has_many :polls, dependent: :destroy - # PuSH subscriptions - has_many :subscriptions, dependent: :destroy - # Report relationships has_many :reports, dependent: :destroy, inverse_of: :account has_many :targeted_reports, class_name: 'Report', foreign_key: :target_account_id, dependent: :destroy, inverse_of: :target_account diff --git a/app/models/concerns/omniauthable.rb b/app/models/concerns/omniauthable.rb index 283033083..b9c124841 100644 --- a/app/models/concerns/omniauthable.rb +++ b/app/models/concerns/omniauthable.rb @@ -43,7 +43,7 @@ module Omniauthable # Check if the user exists with provided email if the provider gives us a # verified email. If no verified email was provided or the user already # exists, we assign a temporary email and ask the user to verify it on - # the next step via Auth::ConfirmationsController.finish_signup + # the next step via Auth::SetupController.show user = User.new(user_params_from_auth(auth)) user.account.avatar_remote_url = auth.info.image if auth.info.image =~ /\A#{URI.regexp(%w(http https))}\z/ |