Merge tag 'v2.9.3' into hometown-2.9.3

2019-08-19 14:28:19 -07:00
parent f66e192c2e 06f906acac
commit 6c2e2969ca
98 changed files with 852 additions and 270 deletions
--- a/app/controllers/api/v1/accounts/statuses_controller.rb
+++ b/app/controllers/api/v1/accounts/statuses_controller.rb
@ -3,7 +3,8 @@
 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
+
+  after_action :insert_pagination_headers, unless: -> { truthy_param?(:pinned) }

  respond_to :json