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/settings/preferences_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/settings/preferences_controller.rb')
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 425664d49..4733170dc 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -23,7 +23,7 @@ class Settings::PreferencesController < Settings::BaseController def user_params params.require(:user).permit( :locale, - filtered_languages: [] + chosen_languages: [] ) end @@ -31,6 +31,7 @@ class Settings::PreferencesController < Settings::BaseController params.require(:user).permit( :setting_default_privacy, :setting_default_sensitive, + :setting_default_language, :setting_unfollow_modal, :setting_boost_modal, :setting_favourite_modal, |