diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 14:33:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-12 14:33:14 +0100 |
commit | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (patch) | |
tree | 5cdf443e718788f8473148ce4d4205da54efbf04 /app/controllers/statuses_controller.rb | |
parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
parent | a808ac1fd8d4a42ee930bbb30cb6b58c810f828b (diff) |
Merge pull request #1920 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/statuses_controller.rb')
-rw-r--r-- | app/controllers/statuses_controller.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index 6986176ea..1a835c726 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -2,7 +2,6 @@ class StatusesController < ApplicationController include WebAppControllerConcern - include StatusControllerConcern include SignatureAuthentication include Authorization include AccountOwnedConcern |