about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-06-12 18:13:30 -0500
committerGitHub <noreply@github.com>2018-06-12 18:13:30 -0500
commit5cff053944b4327477ca45882c9dd3b1a7a559e8 (patch)
tree83c564879534ea35f468ce319342e011773f24aa /app/models
parent99b2bc2668e79bacd7f8696315206872086ebf3a (diff)
parentf6bb50b6ece555af138df164680189b1ec57da4b (diff)
Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
Diffstat (limited to 'app/models')
-rw-r--r--app/models/web/push_subscription.rb2
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