diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-12 16:24:22 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-12 16:24:22 +0200 |
| commit | c4ae7aab6f9f66073b0200a837652df5942e9b7b (patch) | |
| tree | 39be81a1bd3270e2a32a11be3340bf26a463f858 /app/controllers/api/v1/accounts | |
| parent | aa485d6f055b93fd7a9df8b47ed96122b38af39e (diff) | |
| parent | 74111bbb1c643aae516bd4bcb201052161ee725d (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/api/v1/accounts')
| -rw-r--r-- | app/controllers/api/v1/accounts/statuses_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/api/v1/accounts/statuses_controller.rb b/app/controllers/api/v1/accounts/statuses_controller.rb index 8cd8f8e79..13cb4caf1 100644 --- 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 |