Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields

spec/controllers/settings/preferences_controller_spec.rb

@@ -18,12 +18,12 @@ describe Settings::PreferencesController do
 
   describe 'PUT #update' do
     it 'updates the user record' do
-      put :update, params: { user: { locale: 'en', filtered_languages: ['es', 'fr', ''] } }
+      put :update, params: { user: { locale: 'en', chosen_languages: ['es', 'fr', ''] } }
 
       expect(response).to redirect_to(settings_preferences_path)
       user.reload
       expect(user.locale).to eq 'en'
-      expect(user.filtered_languages).to eq ['es', 'fr']
+      expect(user.chosen_languages).to eq ['es', 'fr']
     end
 
     it 'updates user settings' do