bgme/mastodon
1
0
Fork 0
mirror of https://github.com/yingziwu/mastodon.git synced 2026-02-24 19:22:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
wuyingren 2019-10-01 21:21:04 +08:00
commit 6d173cec8e
28 changed files with 406 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/application.rb
View file

@ -15,6 +15,7 @@ require_relative '../lib/mastodon/snowflake'
require_relative '../lib/mastodon/version'
require_relative '../lib/devise/two_factor_ldap_authenticatable'
require_relative '../lib/devise/two_factor_pam_authenticatable'
require_relative '../lib/chewy/strategy/custom_sidekiq'
Dotenv::Railtie.load

5
config/initializers/chewy.rb
View file

@ -12,8 +12,9 @@ Chewy.settings = {
sidekiq: { queue: 'pull' },
}
Chewy.root_strategy = enabled ? :sidekiq : :bypass
Chewy.request_strategy = enabled ? :sidekiq : :bypass
Chewy.root_strategy = :custom_sidekiq
Chewy.request_strategy = :custom_sidekiq
Chewy.use_after_commit_callbacks = false
module Chewy
class << self

1
config/locales/en.yml
View file

@ -240,6 +240,7 @@ en:
delete: Delete
destroyed_msg: Emojo successfully destroyed!
disable: Disable
disabled: Disabled
disabled_msg: Successfully disabled that emoji
emoji: Emoji
enable: Enable