diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-08 23:20:39 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-08 23:20:39 -0600 |
| commit | ce7f4aef163bec9caf82d96e4735d43d72ea0c3b (patch) | |
| tree | dd10a8c0af3120e0cb872e378e23fde017d4c5df /app/controllers/api/base_controller.rb | |
| parent | ec0bdd6c1a5cb53d540f5bb0ef57ee9e9776e38c (diff) | |
| parent | 7c719c567cb5c4fef0b04c7659b894cabec5a0ac (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'app/controllers/api/base_controller.rb')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 2 |
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 |