diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-12 23:01:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-12 23:01:19 +0200 |
| commit | cf421bafdf644f8c8a44b4f06f82841cbd568cdf (patch) | |
| tree | 4d1f3b2c9bdcadcf0fe53372a75ba54c0c06875a /app/controllers/api | |
| parent | aa485d6f055b93fd7a9df8b47ed96122b38af39e (diff) | |
| parent | cfca28bc874125e63e7e1a3c96d94bd5a7eca108 (diff) | |
Merge pull request #1196 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api')
| -rw-r--r-- | app/controllers/api/base_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/api/v1/accounts/statuses_controller.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb index 109e38ffa..de8fff30e 100644 --- a/app/controllers/api/base_controller.rb +++ b/app/controllers/api/base_controller.rb @@ -14,6 +14,8 @@ class Api::BaseController < ApplicationController protect_from_forgery with: :null_session + skip_around_action :set_locale + rescue_from ActiveRecord::RecordInvalid, Mastodon::ValidationError do |e| render json: { error: e.to_s }, status: 422 end 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 |