Merge remote-tracking branch 'glitch/main'

2 files changed, 12 insertions, 2 deletions

diff --git a/db/post_migrate/20220527114923_remove_filtered_languages_from_users.rb b/db/post_migrate/20220527114923_remove_filtered_languages_from_users.rb
new file mode 100644
index 000000000..bd3664c72
--- /dev/null
+++ b/db/post_migrate/20220527114923_remove_filtered_languages_from_users.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RemoveFilteredLanguagesFromUsers < ActiveRecord::Migration[6.1]
+  disable_ddl_transaction!
+
+  def change
+    safety_assured do
+      remove_column :users, :filtered_languages, :string, array: true, default: [], null: false
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 4552828d6..07dc11592 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2022_04_29_101850) do
+ActiveRecord::Schema.define(version: 2022_05_27_114923) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -986,7 +986,6 @@ ActiveRecord::Schema.define(version: 2022_04_29_101850) do
     t.boolean "otp_required_for_login", default: false, null: false
     t.datetime "last_emailed_at"
     t.string "otp_backup_codes", array: true
-    t.string "filtered_languages", default: [], null: false, array: true
     t.bigint "account_id", null: false
     t.boolean "disabled", default: false, null: false
     t.boolean "moderator", default: false, null: false