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

2024-03-26 09:08:20 +09:00 · 2024-03-26 09:08:20 +09:00 · 6c9b221cb2
commit 6c9b221cb2
parent 95ab1f729c 0cea7a623b
263 changed files with 4628 additions and 1518 deletions
--- a/app/models/concerns/user/has_settings.rb
+++ b/app/models/concerns/user/has_settings.rb
@ -87,10 +87,6 @@ module User::HasSettings
    settings['slip_local_emoji_reaction']
  end

-  def setting_unfollow_modal
-    settings['web.unfollow_modal']
-  end
-
  def setting_boost_modal
    settings['web.reblog_modal']
  end