Merge commit 'f826a95f6e' into kb_migration

2023-07-25 15:09:10 +09:00 · 2023-07-25 15:09:10 +09:00 · 4b65740722
commit 4b65740722
parent 5233e68f13 f826a95f6e
211 changed files with 628 additions and 599 deletions
--- a/app/models/user_settings.rb
+++ b/app/models/user_settings.rb
@ -32,7 +32,6 @@ class UserSettings
  setting :emoji_reaction_streaming_notify_impl2, default: false

  namespace :web do
-    setting :crop_images, default: true
    setting :advanced_layout, default: false
    setting :trends, default: true
    setting :use_blurhash, default: true