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

Conflicts:
	.circleci/config.yml
	app/controllers/authorize_follows_controller.rb
	app/javascript/packs/public.js

Moved new stuff from packs/public.js to core/public.js.
Added appropriate use_pack in new controllers.

1 files changed, 10 insertions, 7 deletions

diff --git a/db/migrate/20180812173710_copy_status_stats.rb b/db/migrate/20180812173710_copy_status_stats.rb
index 64a564ca0..0c5907c30 100644
--- a/db/migrate/20180812173710_copy_status_stats.rb
+++ b/db/migrate/20180812173710_copy_status_stats.rb
@@ -3,13 +3,16 @@ class CopyStatusStats < ActiveRecord::Migration[5.2]
 
   def up
     safety_assured do
-      execute <<-SQL.squish
-        INSERT INTO status_stats (status_id, reblogs_count, favourites_count, created_at, updated_at)
-        SELECT id, reblogs_count, favourites_count, created_at, updated_at
-        FROM statuses
-        ON CONFLICT (status_id) DO UPDATE
-        SET reblogs_count = EXCLUDED.reblogs_count, favourites_count = EXCLUDED.favourites_count
-      SQL
+      Status.where.not(id: StatusStat.select('status_id')).select('id').find_in_batches do |statuses|
+        execute <<-SQL.squish
+          INSERT INTO status_stats (status_id, reblogs_count, favourites_count, created_at, updated_at)
+          SELECT id, reblogs_count, favourites_count, created_at, updated_at
+          FROM statuses
+          WHERE id IN (#{statuses.map(&:id).join(', ')})
+          ON CONFLICT (status_id) DO UPDATE
+          SET reblogs_count = EXCLUDED.reblogs_count, favourites_count = EXCLUDED.favourites_count
+        SQL
+      end
     end
   end