Merge commit 'd331c479e4cf79d104e129db24355d80759b4d4d' into devpf

# Conflicts:
#	db/schema.rb

app/models/dossier_correction.rb

@@ -14,8 +14,6 @@ class DossierCorrection < ApplicationRecord
   belongs_to :dossier
   belongs_to :commentaire
 
-  self.ignored_columns += ['kind']
-
   validates_associated :commentaire
 
   scope :pending, -> { where(resolved_at: nil) }

db/migrate/20230713163641_remove_dossier_corrections_kind.rb

@@ -0,0 +1,7 @@
+class RemoveDossierCorrectionsKind < ActiveRecord::Migration[7.0]
+  def change
+    safety_assured do
+      remove_column :dossier_corrections, :kind, :string, default: 'incorrect', null: false
+    end
+  end
+end

db/schema.rb

@@ -334,7 +334,6 @@
     t.bigint "commentaire_id"
     t.datetime "created_at", null: false
     t.bigint "dossier_id", null: false
-    t.string "kind", default: "correction", null: false
     t.string "reason", default: "incorrect", null: false
     t.datetime "resolved_at"
     t.datetime "updated_at", null: false