diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-26 13:23:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 13:23:52 +0200 |
| commit | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (patch) | |
| tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/controllers/api/base_controller.rb | |
| parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
| parent | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (diff) | |
Merge pull request #671 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/base_controller.rb')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 770a69921..0b3735087 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -7,6 +7,8 @@ class Api::BaseController < ApplicationController include RateLimitHeaders skip_before_action :store_current_location + skip_before_action :check_user_permissions + protect_from_forgery with: :null_session rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e| |