diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-06-12 13:17:21 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-06-12 13:17:21 +0000 |
| commit | 4d8d1fa129b5f8692311de211203bc18c614951f (patch) | |
| tree | e9a1130c9a9e5a5b8babd2ba3153e4ed03a4581e /app/models | |
| parent | 34f1fd2a621ca869c17009487e2f10063812fbd0 (diff) | |
| parent | 6151308c47efb0e05bcb2c54aa1693f5ff04da5c (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/web/push_subscription.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb index 867bc9519..d19b20c48 100644 --- a/app/models/web/push_subscription.rb +++ b/app/models/web/push_subscription.rb @@ -18,7 +18,7 @@ class Web::PushSubscription < ApplicationRecord belongs_to :user, optional: true belongs_to :access_token, class_name: 'Doorkeeper::AccessToken', optional: true - has_one :session_activation + has_one :session_activation, foreign_key: 'web_push_subscription_id', inverse_of: :web_push_subscription def push(notification) I18n.with_locale(associated_user&.locale || I18n.default_locale) do |