Merge remote-tracking branch 'parent/main' into upstream-20240128

This commit is contained in:
KMY 2025-01-28 18:02:01 +09:00
commit 3e065f4e12
200 changed files with 2190 additions and 738 deletions

View file

@ -25,10 +25,10 @@ class Settings::Preferences::BaseController < Settings::BaseController
end
def original_user_params
params.require(:user).permit(:locale, :time_zone, :custom_css_text, chosen_languages: [], settings_attributes: UserSettings.keys)
params.expect(user: [:locale, :time_zone, :custom_css_text, chosen_languages: [], settings_attributes: UserSettings.keys])
end
def disabled_visibilities_params
params.require(:user).permit(settings_attributes: { enabled_visibilities: [] })
params.expect(user: [settings_attributes: { enabled_visibilities: [] }])
end
end