forked from berserker/microblog
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.local
commit
f3eff922a3
62 changed files with 553 additions and 516 deletions
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class AfterRemoteFollowRequestWorker |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options queue: 'pull', retry: 5 |
||||
|
||||
def perform(follow_request_id); end |
||||
end |
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class AfterRemoteFollowWorker |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options queue: 'pull', retry: 5 |
||||
|
||||
def perform(follow_id); end |
||||
end |
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class NotificationWorker |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options queue: 'push', retry: 5 |
||||
|
||||
def perform(xml, source_account_id, target_account_id); end |
||||
end |
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class ProcessingWorker |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options backtrace: true |
||||
|
||||
def perform(account_id, body); end |
||||
end |
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class Pubsubhubbub::ConfirmationWorker |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options queue: 'push', retry: false |
||||
|
||||
def perform(subscription_id, mode, secret = nil, lease_seconds = nil); end |
||||
end |
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class Pubsubhubbub::DeliveryWorker |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options queue: 'push', retry: 3, dead: false |
||||
|
||||
def perform(subscription_id, payload); end |
||||
end |
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class Pubsubhubbub::DistributionWorker |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options queue: 'push' |
||||
|
||||
def perform(stream_entry_ids); end |
||||
end |
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class Pubsubhubbub::RawDistributionWorker |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options queue: 'push' |
||||
|
||||
def perform(xml, source_account_id); end |
||||
end |
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class Pubsubhubbub::SubscribeWorker |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options queue: 'push', retry: 10, unique: :until_executed, dead: false |
||||
|
||||
def perform(account_id); end |
||||
end |
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class Pubsubhubbub::UnsubscribeWorker |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options queue: 'push', retry: false, unique: :until_executed, dead: false |
||||
|
||||
def perform(account_id); end |
||||
end |
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class RemoteProfileUpdateWorker |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options queue: 'pull' |
||||
|
||||
def perform(account_id, body, resubscribe); end |
||||
end |
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class SalmonWorker |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options backtrace: true |
||||
|
||||
def perform(account_id, body); end |
||||
end |
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class Scheduler::SubscriptionsCleanupScheduler |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options unique: :until_executed, retry: 0 |
||||
|
||||
def perform; end |
||||
end |
@ -1,9 +0,0 @@ |
||||
# frozen_string_literal: true |
||||
|
||||
class Scheduler::SubscriptionsScheduler |
||||
include Sidekiq::Worker |
||||
|
||||
sidekiq_options unique: :until_executed, retry: 0 |
||||
|
||||
def perform; end |
||||
end |
Loading…
Reference in new issue