diff options
author | ThibG <thib@sitedethib.com> | 2018-06-22 00:10:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-22 00:10:43 +0200 |
commit | 03cfe366fd0146cb4c3ede4dcdeeb2228a513e7d (patch) | |
tree | 4ea4874b420a859b706b1187440e2ed103800396 /app/controllers/api/v1/accounts/credentials_controller.rb | |
parent | f0161702d857a2f91d2e51469e8480253ffcd86e (diff) | |
parent | 0c3a337e045dbd4b7be6ae6c3f07969b42f08857 (diff) |
Merge pull request #550 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/accounts/credentials_controller.rb')
-rw-r--r-- | app/controllers/api/v1/accounts/credentials_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/api/v1/accounts/credentials_controller.rb b/app/controllers/api/v1/accounts/credentials_controller.rb index 259d07be8..2d0737ee4 100644 --- a/app/controllers/api/v1/accounts/credentials_controller.rb +++ b/app/controllers/api/v1/accounts/credentials_controller.rb @@ -32,6 +32,7 @@ class Api::V1::Accounts::CredentialsController < Api::BaseController { 'setting_default_privacy' => source_params.fetch(:privacy, @account.user.setting_default_privacy), 'setting_default_sensitive' => source_params.fetch(:sensitive, @account.user.setting_default_sensitive), + 'setting_default_language' => source_params.fetch(:language, @account.user.setting_default_language), } end end |