Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: config/locales/simple_form.ja.yml
2018-05-19 22:41:10 +02:00
parent 625c4f36ef 6aa5ea1b5d
commit b481e4fac1
113 changed files with 595 additions and 753 deletions
--- a/app/controllers/oauth/authorized_applications_controller.rb
+++ b/app/controllers/oauth/authorized_applications_controller.rb
@ -9,6 +9,11 @@ class Oauth::AuthorizedApplicationsController < Doorkeeper::AuthorizedApplicatio

  include Localized

+  def destroy
+    Web::PushSubscription.unsubscribe_for(params[:id], current_resource_owner)
+    super
+  end
+
  private

  def store_current_location