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

db/migrate/20240304090449_migrate_interaction_settings_to_policy.rb

@@ -20,7 +20,8 @@ class MigrateInteractionSettingsToPolicy < ActiveRecord::Migration[7.1]
   def up
     User.includes(account: :notification_policy).find_each do |user|
       deserialized_settings = Oj.load(user.attributes_before_type_cast['settings'])
-      next unless deserialized_settings
+
+      next if deserialized_settings.nil?
 
       policy = user.account.notification_policy || user.account.build_notification_policy
       requires_new_policy = false

db/migrate/20240310123453_add_hint_to_rules.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddHintToRules < ActiveRecord::Migration[7.1]
+  def change
+    add_column :rules, :hint, :text, null: false, default: ''
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_03_04_090449) do
+ActiveRecord::Schema[7.1].define(version: 2024_03_10_123453) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -1211,6 +1211,7 @@ ActiveRecord::Schema[7.1].define(version: 2024_03_04_090449) do
     t.text "text", default: "", null: false
     t.datetime "created_at", precision: nil, null: false
     t.datetime "updated_at", precision: nil, null: false
+    t.text "hint", default: "", null: false
   end
 
   create_table "scheduled_expiration_statuses", force: :cascade do |t|