diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-03-22 17:00:38 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-22 17:00:38 +0100 |
commit | 59864ff495cb607b4e2632b8b8ca183c1e602626 (patch) | |
tree | 7dfc6dc1fff3d8864497d0ed32aff5862b5e47e9 /app/controllers/activitypub | |
parent | 9ff119eecd1079e52a8a41d7b8d61520c4303c2f (diff) | |
parent | 67d550830b3b1a9a2b65b1ab98ea4bcd491666c5 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted.
Diffstat (limited to 'app/controllers/activitypub')
-rw-r--r-- | app/controllers/activitypub/base_controller.rb | 1 |
1 files changed, 1 insertions, 0 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 |