Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields

2 files changed, 12 insertions, 0 deletions

diff --git a/db/migrate/20180616192031_add_chosen_languages_to_users.rb b/db/migrate/20180616192031_add_chosen_languages_to_users.rb
new file mode 100644
index 000000000..48b53019d
--- /dev/null
+++ b/db/migrate/20180616192031_add_chosen_languages_to_users.rb
@@ -0,0 +1,5 @@
+class AddChosenLanguagesToUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :chosen_languages, :string, array: true, null: true, default: nil
+  end
+end
diff --git a/db/migrate/20180617162849_remove_unused_indexes.rb b/db/migrate/20180617162849_remove_unused_indexes.rb
new file mode 100644
index 000000000..61add6385
--- /dev/null
+++ b/db/migrate/20180617162849_remove_unused_indexes.rb
@@ -0,0 +1,7 @@
+class RemoveUnusedIndexes < ActiveRecord::Migration[5.2]
+  def change
+    remove_index :statuses, name: "index_statuses_on_conversation_id"
+    remove_index :users, name: "index_users_on_filtered_languages"
+    remove_index :backups, name: "index_backups_on_user_id"
+  end
+end