diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-23 15:56:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-23 15:56:24 +0100 |
| commit | 6f032076ed0f338d914d70aaa3333d4c00940c71 (patch) | |
| tree | 274b9b71a73dabcdc7fb89e14b329a38a917fda0 /app/controllers | |
| parent | 9ff119eecd1079e52a8a41d7b8d61520c4303c2f (diff) | |
| parent | 6391a869aee853b01bdd9136b390e2f9b21857cb (diff) | |
Merge pull request #1721 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/activitypub/base_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/api/base_controller.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/activitypub/base_controller.rb b/app/controllers/activitypub/base_controller.rb index 4cbc3ab8f..196d85a32 100644 --- a/app/controllers/activitypub/base_controller.rb +++ b/app/controllers/activitypub/base_controller.rb @@ -2,6 +2,7 @@ class ActivityPub::BaseController < Api::BaseController skip_before_action :require_authenticated_user! + skip_around_action :set_locale private diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 72c30dec7..d96285b44 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -15,8 +15,6 @@ class Api::BaseController < ApplicationController protect_from_forgery with: :null_session - skip_around_action :set_locale - rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e| render json: { error: e.to_s }, status: 422 end |