Compare commits
33 Commits
Author | SHA1 | Date |
---|---|---|
Eugen Rochko | 5322654945 | |
Eugen Rochko | fcaa6ec4a6 | |
Eugen Rochko | 910ae09426 | |
Eugen Rochko | 9a97beb3a5 | |
Eugen Rochko | 1ebcdf84b5 | |
Eugen Rochko | 791c0edfe8 | |
Eugen Rochko | 17c2ba7366 | |
Eugen Rochko | f4ab6b9f2c | |
Eugen Rochko | f63ccd8787 | |
Eugen Rochko | 7a1903cdf7 | |
Eugen Rochko | 4142036f2b | |
Eugen Rochko | 24656a9f8f | |
Eugen Rochko | 47910f57da | |
Eugen Rochko | 2a4499bb23 | |
Eugen Rochko | e258d05848 | |
Eugen Rochko | 7c81c0f7cb | |
Eugen Rochko | 1ec81ccec0 | |
Eugen Rochko | 3fa8505769 | |
Eugen Rochko | 011bcbf21f | |
Eugen Rochko | 6164662e1f | |
Eugen Rochko | ed4d2d8a69 | |
Eugen Rochko | 453c15ab76 | |
Eugen Rochko | 2dc2003b99 | |
Eugen Rochko | 4d1217d8f9 | |
Eugen Rochko | 0468256ab0 | |
Eugen Rochko | 634110d8bd | |
Eugen Rochko | 40d390e85d | |
Eugen Rochko | 31e086de0e | |
Eugen Rochko | 196e44b30b | |
Eugen Rochko | 945e5bf9cc | |
Eugen Rochko | a24d55eed8 | |
Eugen Rochko | 7f7a67a7c1 | |
Eugen Rochko | 300bc70123 |
3
Gemfile
3
Gemfile
|
@ -62,6 +62,9 @@ gem 'react-rails'
|
||||||
gem 'browserify-rails'
|
gem 'browserify-rails'
|
||||||
gem 'autoprefixer-rails'
|
gem 'autoprefixer-rails'
|
||||||
|
|
||||||
|
gem 'skylight'
|
||||||
|
gem 'sidekiq-skylight'
|
||||||
|
|
||||||
group :development, :test do
|
group :development, :test do
|
||||||
gem 'rspec-rails'
|
gem 'rspec-rails'
|
||||||
gem 'pry-rails'
|
gem 'pry-rails'
|
||||||
|
|
|
@ -401,6 +401,9 @@ GEM
|
||||||
connection_pool (~> 2.2, >= 2.2.0)
|
connection_pool (~> 2.2, >= 2.2.0)
|
||||||
rack-protection (>= 1.5.0)
|
rack-protection (>= 1.5.0)
|
||||||
redis (~> 3.2, >= 3.2.1)
|
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-unique-jobs (5.0.0)
|
||||||
sidekiq (>= 4.0)
|
sidekiq (>= 4.0)
|
||||||
thor
|
thor
|
||||||
|
@ -414,6 +417,8 @@ GEM
|
||||||
json (>= 1.8, < 3)
|
json (>= 1.8, < 3)
|
||||||
simplecov-html (~> 0.10.0)
|
simplecov-html (~> 0.10.0)
|
||||||
simplecov-html (0.10.0)
|
simplecov-html (0.10.0)
|
||||||
|
skylight (1.2.0)
|
||||||
|
activesupport (>= 3.0.0)
|
||||||
slop (3.6.0)
|
slop (3.6.0)
|
||||||
sprockets (3.7.1)
|
sprockets (3.7.1)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
|
@ -532,10 +537,12 @@ DEPENDENCIES
|
||||||
ruby-oembed
|
ruby-oembed
|
||||||
sass-rails (~> 5.0)
|
sass-rails (~> 5.0)
|
||||||
sidekiq
|
sidekiq
|
||||||
|
sidekiq-skylight
|
||||||
sidekiq-unique-jobs
|
sidekiq-unique-jobs
|
||||||
simple-navigation
|
simple-navigation
|
||||||
simple_form
|
simple_form
|
||||||
simplecov
|
simplecov
|
||||||
|
skylight
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
statsd-instrument
|
statsd-instrument
|
||||||
twitter-text
|
twitter-text
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
class ProcessingWorker
|
class ProcessingWorker
|
||||||
include Sidekiq::Worker
|
include Sidekiq::Worker
|
||||||
|
|
||||||
sidekiq_options backtrace: true
|
sidekiq_options queue: 'pull', backtrace: true
|
||||||
|
|
||||||
def perform(account_id, body)
|
def perform(account_id, body)
|
||||||
ProcessFeedService.new.call(body, Account.find(account_id))
|
ProcessFeedService.new.call(body, Account.find(account_id))
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
class SalmonWorker
|
class SalmonWorker
|
||||||
include Sidekiq::Worker
|
include Sidekiq::Worker
|
||||||
|
|
||||||
sidekiq_options backtrace: true
|
sidekiq_options queue: 'pull', backtrace: true
|
||||||
|
|
||||||
def perform(account_id, body)
|
def perform(account_id, body)
|
||||||
ProcessInteractionService.new.call(body, Account.find(account_id))
|
ProcessInteractionService.new.call(body, Account.find(account_id))
|
||||||
|
|
|
@ -1,14 +1,12 @@
|
||||||
# frozen_string_literal: true
|
|
||||||
|
|
||||||
lock '3.8.0'
|
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 :application, 'mastodon'
|
||||||
|
set :repo_url, 'https://github.com/tootsuite/mastodon.git'
|
||||||
|
set :branch, 'skylight'
|
||||||
set :rbenv_type, :user
|
set :rbenv_type, :user
|
||||||
set :rbenv_ruby, File.read('.ruby-version').strip
|
set :rbenv_ruby, File.read('.ruby-version').strip
|
||||||
set :migration_role, :app
|
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'
|
||||||
|
|
Reference in New Issue