diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-20 16:37:35 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 16:37:35 -0600 |
| commit | 24b6e4121f656d24adc5676e8a207ded610a7ea7 (patch) | |
| tree | 1c7b908468e12a40a6433f02f86f2cf47fa53cf9 /app/models/session_activation.rb | |
| parent | b8c6656ce9e498f2e99d6301212bcd12e7f839df (diff) | |
| parent | 3cae3622146d80aef8e43e5790d25f5e2fc9931e (diff) | |
Merge pull request #342 from glitch-soc/merge-upstream
Merge upstream
Diffstat (limited to 'app/models/session_activation.rb')
| -rw-r--r-- | app/models/session_activation.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb index 1d4ebca02..d364f03df 100644 --- a/app/models/session_activation.rb +++ b/app/models/session_activation.rb @@ -15,9 +15,9 @@ # class SessionActivation < ApplicationRecord - belongs_to :user, inverse_of: :session_activations, required: true - belongs_to :access_token, class_name: 'Doorkeeper::AccessToken', dependent: :destroy - belongs_to :web_push_subscription, class_name: 'Web::PushSubscription', dependent: :destroy + belongs_to :user, inverse_of: :session_activations + belongs_to :access_token, class_name: 'Doorkeeper::AccessToken', dependent: :destroy, optional: true + belongs_to :web_push_subscription, class_name: 'Web::PushSubscription', dependent: :destroy, optional: true delegate :token, to: :access_token, |