Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions

2018-06-12 18:13:30 -05:00
parent 99b2bc2668 f6bb50b6ec
commit 5cff053944
62 changed files with 868 additions and 195 deletions
--- 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