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

2024-11-26 12:56:31 +09:00 · 2024-11-26 12:56:31 +09:00 · 8a075ba4c6
commit 8a075ba4c6
parent f630b9a830 6d62581da1
303 changed files with 7495 additions and 4498 deletions
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@ -18,6 +18,7 @@
      = f.input :time_zone,
                collection: ActiveSupport::TimeZone.all.map { |tz| ["(GMT#{tz.formatted_offset}) #{tz.name}", tz.tzinfo.name] },
                hint: false,
+                selected: current_user.time_zone || Time.zone.tzinfo.name,
                wrapper: :with_label

  .fields-group