Merge remote-tracking branch 'parent/main' into kb_migration
This commit is contained in:
commit
a0b98f9242
180 changed files with 2539 additions and 313 deletions
|
@ -5,6 +5,7 @@ default: &default
|
|||
connect_timeout: 15
|
||||
encoding: unicode
|
||||
sslmode: <%= ENV['DB_SSLMODE'] || "prefer" %>
|
||||
application_name: ''
|
||||
|
||||
development:
|
||||
<<: *default
|
||||
|
|
|
@ -87,6 +87,8 @@ Rails.application.configure do
|
|||
config.x.otp_secret = ENV.fetch('OTP_SECRET', '1fc2b87989afa6351912abeebe31ffc5c476ead9bf8b3d74cbc4a302c7b69a45b40b1bbef3506ddad73e942e15ed5ca4b402bf9a66423626051104f4b5f05109')
|
||||
end
|
||||
|
||||
Redis.raise_deprecations = true
|
||||
|
||||
ActiveRecordQueryTrace.enabled = ENV['QUERY_TRACE_ENABLED'] == 'true'
|
||||
|
||||
module PrivateAddressCheck
|
||||
|
|
|
@ -73,3 +73,5 @@ end
|
|||
|
||||
# Catch serialization warnings early
|
||||
Sidekiq.strict_args!
|
||||
|
||||
Redis.raise_deprecations = true
|
||||
|
|
1
config/initializers/redis.rb
Normal file
1
config/initializers/redis.rb
Normal file
|
@ -0,0 +1 @@
|
|||
Redis.sadd_returns_boolean = false
|
|
@ -1454,6 +1454,7 @@ en:
|
|||
electron: Electron
|
||||
firefox: Firefox
|
||||
generic: Unknown browser
|
||||
huawei_browser: Huawei Browser
|
||||
ie: Internet Explorer
|
||||
micro_messenger: MicroMessenger
|
||||
nokia: Nokia S40 Ovi Browser
|
||||
|
@ -1463,6 +1464,7 @@ en:
|
|||
qq: QQ Browser
|
||||
safari: Safari
|
||||
uc_browser: UC Browser
|
||||
unknown_browser: Unknown Browser
|
||||
weibo: Weibo
|
||||
current_session: Current session
|
||||
description: "%{browser} on %{platform}"
|
||||
|
@ -1475,9 +1477,10 @@ en:
|
|||
chrome_os: ChromeOS
|
||||
firefox_os: Firefox OS
|
||||
ios: iOS
|
||||
kai_os: KaiOS
|
||||
linux: Linux
|
||||
mac: macOS
|
||||
other: unknown platform
|
||||
unknown_platform: Unknown Platform
|
||||
windows: Windows
|
||||
windows_mobile: Windows Mobile
|
||||
windows_phone: Windows Phone
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue