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

2018-01-15 06:17:15 +00:00
parent 8ee6ed358f 74c1c9ec01
commit 0c7dc6c781
13 changed files with 51 additions and 13 deletions
--- a/app/controllers/api/web/push_subscriptions_controller.rb
+++ b/app/controllers/api/web/push_subscriptions_controller.rb
@ -4,6 +4,7 @@ class Api::Web::PushSubscriptionsController < Api::BaseController
  respond_to :json

  before_action :require_user!
+  protect_from_forgery with: :exception

  def create
    params.require(:subscription).require(:endpoint)