Merge branch 'master' into skylight

Don't link robots.txt
2025-12-11 14:30:35 +00:00 · 2017-04-19 19:24:31 +02:00 · 2017-04-19 18:34:20 +02:00 · 2017-04-19 17:48:44 +02:00 · 2017-04-16 23:33:35 +02:00 · 2017-04-13 22:28:33 +02:00
5 changed files with 17 additions and 9 deletions
--- a/3
+++ b/3
@@ -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'
--- a/Gemfile.lock
+++ b/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
--- a/app/workers/processing_worker.rb
+++ b/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))
--- a/app/workers/salmon_worker.rb
+++ b/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))
--- a/config/deploy.rb
+++ b/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_dirs, 'vendor/bundle', 'node_modules', 'public/system'
+append :linked_files, '.env.production'
+append :linked_dirs, 'vendor/bundle', 'public/system'
Author	SHA1	Message	Date
Eugen Rochko	5322654945	Merge branch 'master' into skylight	2017-04-19 19:24:31 +02:00
Eugen Rochko	fcaa6ec4a6	Don't link robots.txt	2017-04-19 18:34:20 +02:00
Eugen Rochko	910ae09426	Merge branch 'master' into skylight	2017-04-19 17:48:44 +02:00
Eugen Rochko	9a97beb3a5	Merge branch 'master' into skylight	2017-04-16 23:33:35 +02:00
Eugen Rochko	1ebcdf84b5	Merge branch 'master' into skylight	2017-04-13 22:28:33 +02:00
Eugen Rochko	791c0edfe8	Merge branch 'master' into skylight	2017-04-13 22:22:26 +02:00
Eugen Rochko	17c2ba7366	Merge branch 'master' into skylight	2017-04-13 21:55:13 +02:00
Eugen Rochko	f4ab6b9f2c	Merge branch 'master' into skylight	2017-04-12 21:12:07 +02:00
Eugen Rochko	f63ccd8787	Change deploy	2017-04-12 18:25:34 +02:00
Eugen Rochko	7a1903cdf7	Merge branch 'master' into skylight	2017-04-12 11:28:37 +02:00
Eugen Rochko	4142036f2b	Merge branch 'master' into skylight	2017-04-09 21:02:59 +02:00
Eugen Rochko	24656a9f8f	Merge branch 'master' into skylight	2017-04-09 19:14:08 +02:00
Eugen Rochko	47910f57da	Merge branch 'master' into skylight	2017-04-09 15:01:17 +02:00
Eugen Rochko	2a4499bb23	Merge branch 'master' into skylight	2017-04-08 22:27:03 +02:00
Eugen Rochko	e258d05848	Merge branch 'master' into skylight	2017-04-08 13:27:04 +02:00
Eugen Rochko	7c81c0f7cb	Merge branch 'master' into skylight	2017-04-08 13:24:25 +02:00
Eugen Rochko	1ec81ccec0	Merge branch 'master' into skylight	2017-04-07 13:09:25 +02:00
Eugen Rochko	3fa8505769	Merge branch 'master' into skylight	2017-04-07 12:25:10 +02:00
Eugen Rochko	011bcbf21f	Merge branch 'feature-ox-fix' into skylight	2017-04-07 11:09:29 +02:00
Eugen Rochko	6164662e1f	Force UTF8 encoding on generated XML	2017-04-07 11:05:36 +02:00
Eugen Rochko	ed4d2d8a69	Merge branch 'master' into skylight	2017-04-07 05:59:59 +02:00
Eugen Rochko	453c15ab76	Merge branch 'master' into skylight	2017-04-07 00:06:58 +02:00
Eugen Rochko	2dc2003b99	Disable prepared_statements in production to allow use of pgbouncer	2017-04-06 20:50:13 +02:00
Eugen Rochko	4d1217d8f9	Merge branch 'master' into skylight	2017-04-06 20:50:05 +02:00
Eugen Rochko	0468256ab0	Merge branch 'master' into skylight	2017-04-06 02:27:36 +02:00
Eugen Rochko	634110d8bd	Move ProcessingWorker/SalmonWorker into pull queue	2017-04-06 00:21:00 +02:00
Eugen Rochko	40d390e85d	Merge branch 'master' into skylight	2017-04-05 21:44:22 +02:00
Eugen Rochko	31e086de0e	Merge branch 'master' into skylight	2017-04-05 20:00:21 +02:00
Eugen Rochko	196e44b30b	Merge branch 'master' into skylight	2017-04-05 14:29:51 +02:00
Eugen Rochko	945e5bf9cc	Merge branch 'master' into skylight	2017-04-05 13:34:46 +02:00
Eugen Rochko	a24d55eed8	Add sidekiq-skylight	2017-04-05 02:36:06 +02:00
Eugen Rochko	7f7a67a7c1	Merge branch 'master' into skylight	2017-04-05 02:34:54 +02:00
Eugen Rochko	300bc70123	Add Skylight	2017-04-04 22:32:22 +02:00