about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-01-09 05:17:13 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-01-09 05:17:13 +0000
commit7c719c567cb5c4fef0b04c7659b894cabec5a0ac (patch)
treee28e6607fa12b007f0488bace0c19bc58fa022f1 /app/controllers
parent488381ae2f19cbe37700745d0f97590e84c9b9d1 (diff)
parent628358aeea65587c2862b9fab67a9d18cb52ce93 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/api/base_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 5983c0fbe..52e68ab35 100644
--- 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