Merge branch 'master' into skylight

Gemfile

@@ -62,6 +62,9 @@ gem 'react-rails'
 gem 'browserify-rails'
 gem 'autoprefixer-rails'
 
+gem 'skylight'
+gem 'sidekiq-skylight'
+
 group :development, :test do
   gem 'rspec-rails'
   gem 'pry-rails'

Gemfile.lock

@@ -401,6 +401,9 @@ GEM
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
       redis (~> 3.2, >= 3.2.1)
+    sidekiq-skylight (0.2.0)
+      sidekiq (>= 3.3.0)
+      skylight (>= 0.5.2)
     sidekiq-unique-jobs (5.0.0)
       sidekiq (>= 4.0)
       thor
@@ -414,6 +417,8 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    skylight (1.2.0)
+      activesupport (>= 3.0.0)
     slop (3.6.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
@@ -532,10 +537,12 @@ DEPENDENCIES
   ruby-oembed
   sass-rails (~> 5.0)
   sidekiq
+  sidekiq-skylight
   sidekiq-unique-jobs
   simple-navigation
   simple_form
   simplecov
+  skylight
   sprockets-rails
   statsd-instrument
   twitter-text

app/workers/processing_worker.rb

@@ -3,7 +3,7 @@
 class ProcessingWorker
   include Sidekiq::Worker
 
-  sidekiq_options backtrace: true
+  sidekiq_options queue: 'pull', backtrace: true
 
   def perform(account_id, body)
     ProcessFeedService.new.call(body, Account.find(account_id))

app/workers/salmon_worker.rb

@@ -3,7 +3,7 @@
 class SalmonWorker
   include Sidekiq::Worker
 
-  sidekiq_options backtrace: true
+  sidekiq_options queue: 'pull', backtrace: true
 
   def perform(account_id, body)
     ProcessInteractionService.new.call(body, Account.find(account_id))

config/deploy.rb

@@ -1,14 +1,12 @@
-# frozen_string_literal: true
-
 lock '3.8.0'
 
-set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git')
-set :branch, ENV.fetch('BRANCH', 'master')
-
 set :application, 'mastodon'
+set :repo_url, 'https://github.com/tootsuite/mastodon.git'
+set :branch, 'skylight'
 set :rbenv_type, :user
 set :rbenv_ruby, File.read('.ruby-version').strip
 set :migration_role, :app
+set :conditional_migrate, true
 
-append :linked_files, '.env.production', 'public/robots.txt'
+append :linked_files, '.env.production'
-append :linked_dirs, 'vendor/bundle', 'node_modules', 'public/system'
+append :linked_dirs, 'vendor/bundle', 'public/system'