diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-23 17:21:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-23 17:21:55 +0200 |
| commit | 08325db62bcc4d5d530513c615bc1c733f166239 (patch) | |
| tree | 13cffcc0c8d6ed258928a89c1b328a055c54f2d3 /app/models/concerns | |
| parent | 6db5669818cce459b9bb916665541b7b8f5d5155 (diff) | |
| parent | 48c68eafb73d2e697dab25ec55c235da4daf1cf8 (diff) | |
Merge pull request #1174 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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/ |