diff options
author | ThibG <thib@sitedethib.com> | 2020-03-08 22:09:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-08 22:09:53 +0100 |
commit | 840b17e3444f9a68d3639f1ffeb326e8cb1e03b1 (patch) | |
tree | 8254538ed33f4c4b974b5379f3b5a0b489ba095a /app/controllers/api/v1/preferences_controller.rb | |
parent | 13ef4d5fb0dbb66074f42df7989ae40509a4724f (diff) | |
parent | 9c2922958783f7e499cdda5bb874d6096e47eb0a (diff) |
Merge pull request #1297 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/preferences_controller.rb')
-rw-r--r-- | app/controllers/api/v1/preferences_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/api/v1/preferences_controller.rb b/app/controllers/api/v1/preferences_controller.rb index 077d39f5d..1640a8224 100644 --- a/app/controllers/api/v1/preferences_controller.rb +++ b/app/controllers/api/v1/preferences_controller.rb @@ -4,8 +4,6 @@ class Api::V1::PreferencesController < Api::BaseController before_action -> { doorkeeper_authorize! :read, :'read:accounts' } before_action :require_user! - respond_to :json - def index render json: current_account, serializer: REST::PreferencesSerializer end |