chore: Update dependencies to the latest versions (#5033)
This commit is contained in:
@@ -28,6 +28,11 @@ module Chatwoot
|
||||
|
||||
# Custom chatwoot configurations
|
||||
config.x = config_for(:app).with_indifferent_access
|
||||
|
||||
# https://stackoverflow.com/questions/72970170/upgrading-to-rails-6-1-6-1-causes-psychdisallowedclass-tried-to-load-unspecif
|
||||
# https://discuss.rubyonrails.org/t/cve-2022-32224-possible-rce-escalation-bug-with-serialized-columns-in-active-record/81017
|
||||
# FIX ME : fixes breakage of installation config. we need to migrate.
|
||||
config.active_record.yaml_column_permitted_classes = [HashWithIndifferentAccess]
|
||||
end
|
||||
|
||||
def self.config
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
if ENV['DD_TRACE_AGENT_URL']
|
||||
Datadog.configure do |c|
|
||||
# This will activate auto-instrumentation for Rails
|
||||
c.use :rails
|
||||
# Instrumentation
|
||||
c.tracing.instrument :rails
|
||||
end
|
||||
end
|
||||
|
||||
@@ -27,6 +27,6 @@ if ENV['IP_LOOKUP_SERVICE'].present?
|
||||
if ENV['IP_LOOKUP_SERVICE'] == 'geoip2'
|
||||
Geocoder.configure(ip_lookup: :geoip2, geoip2: { file: GeocoderConfiguration::LOOK_UP_DB })
|
||||
else
|
||||
Geocoder.configure(ip_lookup: ENV['IP_LOOKUP_SERVICE'].to_sym, api_key: ENV['IP_LOOKUP_API_KEY'])
|
||||
Geocoder.configure(ip_lookup: ENV['IP_LOOKUP_SERVICE'].to_sym, api_key: ENV.fetch('IP_LOOKUP_API_KEY', nil))
|
||||
end
|
||||
end
|
||||
|
||||
@@ -18,8 +18,8 @@ Rails.application.configure do
|
||||
|
||||
smtp_settings[:authentication] = ENV.fetch('SMTP_AUTHENTICATION', 'login').to_sym if ENV['SMTP_AUTHENTICATION'].present?
|
||||
smtp_settings[:domain] = ENV['SMTP_DOMAIN'] if ENV['SMTP_DOMAIN'].present?
|
||||
smtp_settings[:user_name] = ENV['SMTP_USERNAME']
|
||||
smtp_settings[:password] = ENV['SMTP_PASSWORD']
|
||||
smtp_settings[:user_name] = ENV.fetch('SMTP_USERNAME', nil)
|
||||
smtp_settings[:password] = ENV.fetch('SMTP_PASSWORD', nil)
|
||||
smtp_settings[:enable_starttls_auto] = ActiveModel::Type::Boolean.new.cast(ENV.fetch('SMTP_ENABLE_STARTTLS_AUTO', true))
|
||||
smtp_settings[:openssl_verify_mode] = ENV['SMTP_OPENSSL_VERIFY_MODE'] if ENV['SMTP_OPENSSL_VERIFY_MODE'].present?
|
||||
smtp_settings[:ssl] = ActiveModel::Type::Boolean.new.cast(ENV.fetch('SMTP_SSL', true)) if ENV['SMTP_SSL']
|
||||
|
||||
@@ -36,6 +36,8 @@ en:
|
||||
reset_password_failure: Uh ho! We could not find any user with the specified email.
|
||||
|
||||
errors:
|
||||
validations:
|
||||
presence: must not be blank
|
||||
webhook:
|
||||
invalid: Invalid events
|
||||
signup:
|
||||
@@ -43,9 +45,19 @@ en:
|
||||
invalid_email: You have entered an invalid email
|
||||
email_already_exists: "You have already signed up for an account with %{email}"
|
||||
failed: Signup failed
|
||||
data_import:
|
||||
data_type:
|
||||
invalid: Invalid data type
|
||||
contacts:
|
||||
import:
|
||||
failed: File is blank
|
||||
email:
|
||||
invalid: Invalid email
|
||||
phone_number:
|
||||
invalid: should be in e164 format
|
||||
categories:
|
||||
locale:
|
||||
unique: should be unique in the category and portal
|
||||
inboxes:
|
||||
imap:
|
||||
socket_error: Please check the network connection, IMAP address and try again.
|
||||
|
||||
Reference in New Issue
Block a user