Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-06-12 13:17:21 +00:00
parent 34f1fd2a62 6151308c47
commit 4d8d1fa129
58 changed files with 837 additions and 188 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