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

2018-01-09 05:17:13 +00:00
parent 488381ae2f 628358aeea
commit 7c719c567c
7 changed files with 24 additions and 14 deletions
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@ -6,8 +6,8 @@ class Api::BaseController < ApplicationController

  include RateLimitHeaders

-  skip_before_action :verify_authenticity_token
  skip_before_action :store_current_location
+  protect_from_forgery with: :null_session

  rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e|
    render json: { error: e.to_s }, status: 422