Merge pull request #2656 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 958a810
glitch-soc · Feb 29, 2024 · 71f673b · 71f673b
2 parents 8dbdd75 + f6654e0
commit 71f673b
Show file tree

Hide file tree

Showing 42 changed files with 547 additions and 375 deletions.
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb
@@ -4,7 +4,7 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
   before_action -> { authorize_if_got_token! :read, :'read:statuses' }
   before_action :set_account
 
-  after_action :insert_pagination_headers, unless: -> { truthy_param?(:pinned) }
+  after_action :insert_pagination_headers
 
   def index
     cache_if_unauthenticated!

diff --git a/app/javascript/core/admin.js b/app/javascript/core/admin.js