Compare commits
29 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
1ebcdf84b5 | ||
|
|
791c0edfe8 | ||
|
|
17c2ba7366 | ||
|
|
f4ab6b9f2c | ||
|
|
f63ccd8787 | ||
|
|
7a1903cdf7 | ||
|
|
4142036f2b | ||
|
|
24656a9f8f | ||
|
|
47910f57da | ||
|
|
2a4499bb23 | ||
|
|
e258d05848 | ||
|
|
7c81c0f7cb | ||
|
|
1ec81ccec0 | ||
|
|
3fa8505769 | ||
|
|
011bcbf21f | ||
|
|
6164662e1f | ||
|
|
ed4d2d8a69 | ||
|
|
453c15ab76 | ||
|
|
2dc2003b99 | ||
|
|
4d1217d8f9 | ||
|
|
0468256ab0 | ||
|
|
634110d8bd | ||
|
|
40d390e85d | ||
|
|
31e086de0e | ||
|
|
196e44b30b | ||
|
|
945e5bf9cc | ||
|
|
a24d55eed8 | ||
|
|
7f7a67a7c1 | ||
|
|
300bc70123 |
3
Gemfile
3
Gemfile
|
|
@ -58,6 +58,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'
|
||||
|
|
|
|||
|
|
@ -391,6 +391,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
|
||||
|
|
@ -404,6 +407,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)
|
||||
|
|
@ -516,10 +521,12 @@ DEPENDENCIES
|
|||
ruby-oembed
|
||||
sass-rails (~> 5.0)
|
||||
sidekiq
|
||||
sidekiq-skylight
|
||||
sidekiq-unique-jobs
|
||||
simple-navigation
|
||||
simple_form
|
||||
simplecov
|
||||
skylight
|
||||
statsd-instrument
|
||||
twitter-text
|
||||
tzinfo-data
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
lock '3.7.2'
|
||||
lock '3.8.0'
|
||||
|
||||
set :application, 'mastodon'
|
||||
set :repo_url, 'https://github.com/tootsuite/mastodon.git'
|
||||
set :branch, 'master'
|
||||
set :branch, 'skylight'
|
||||
set :rbenv_type, :user
|
||||
set :rbenv_ruby, File.read('.ruby-version').strip
|
||||
set :migration_role, :app
|
||||
|
||||
append :linked_files, '.env.production'
|
||||
append :linked_dirs, 'vendor/bundle', 'node_modules', 'public/system'
|
||||
append :linked_dirs, 'vendor/bundle', 'public/system'
|
||||
|
|
|
|||
Reference in a new issue