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

Conflicts:
- app/controllers/admin/base_controller.rb
- app/controllers/filters_controller.rb
- app/controllers/invites_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/exports_controller.rb
- app/controllers/settings/follower_domains_controller.rb
- app/controllers/settings/migrations_controller.rb
- app/controllers/settings/notifications_controller.rb
- app/controllers/settings/preferences_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/packs/public.js
- app/views/settings/profiles/show.html.haml

Conflicts were mostly due to the addition of body classes to the settings page,
this was caused by rejecting upstream changes for most of those files and
modifying Settings::BaseController instead.

Another cause of conflicts was the deletion of client-side checking of
display name / bio length, this was modified in app/javascript/core/settings.js
instead.

2 files changed, 44 insertions, 1 deletions

diff --git a/db/migrate/20181024224956_migrate_account_conversations.rb b/db/migrate/20181024224956_migrate_account_conversations.rb
new file mode 100644
index 000000000..1821e8c27
--- /dev/null
+++ b/db/migrate/20181024224956_migrate_account_conversations.rb
@@ -0,0 +1,43 @@
+class MigrateAccountConversations < ActiveRecord::Migration[5.2]
+  disable_ddl_transaction!
+
+  def up
+    say ''
+    say 'WARNING: This migration may take a *long* time for large instances'
+    say 'It will *not* lock tables for any significant time, but it may run'
+    say 'for a very long time. We will pause for 10 seconds to allow you to'
+    say 'interrupt this migration if you are not ready.'
+    say ''
+
+    10.downto(1) do |i|
+      say "Continuing in #{i} second#{i == 1 ? '' : 's'}...", true
+      sleep 1
+    end
+
+    local_direct_statuses.find_each do |status|
+      AccountConversation.add_status(status.account, status)
+    end
+
+    notifications_about_direct_statuses.find_each do |notification|
+      AccountConversation.add_status(notification.account, notification.target_status)
+    end
+  end
+
+  def down
+  end
+
+  private
+
+  def local_direct_statuses
+    Status.unscoped
+          .local
+          .where(visibility: :direct)
+          .includes(:account, mentions: :account)
+  end
+
+  def notifications_about_direct_statuses
+    Notification.joins(mention: :status)
+                .where(activity_type: 'Mention', statuses: { visibility: :direct })
+                .includes(:account, mention: { status: [:account, mentions: :account] })
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5bfb2d067..01ab9c17b 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: 2018_10_18_205649) do
+ActiveRecord::Schema.define(version: 2018_10_24_224956) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"