From c301845ade3b6810a11267f349d04d37d6c4c7c2 Mon Sep 17 00:00:00 2001 From: Pranav Raj S Date: Wed, 3 Jan 2024 12:49:36 -0800 Subject: [PATCH 1/5] chore: 2023 -> 2024 (#8635) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 11ac5dc2c..17d4e7f5e 100644 --- a/README.md +++ b/README.md @@ -118,4 +118,4 @@ Thanks goes to all these [wonderful people](https://www.chatwoot.com/docs/contri -*Chatwoot* © 2017-2023, Chatwoot Inc - Released under the MIT License. +*Chatwoot* © 2017-2024, Chatwoot Inc - Released under the MIT License. From c29b77c214de3d00f5759561f4c03017706f9488 Mon Sep 17 00:00:00 2001 From: Sojan Jose Date: Thu, 4 Jan 2024 10:47:48 -0800 Subject: [PATCH 2/5] chore(snyk): Security upgrade factory_bot_rails from 6.4.2 to 6.4.3 (#8628) Co-authored-by: snyk-bot --- Gemfile | 2 +- Gemfile.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 8debc879f..3d3299b90 100644 --- a/Gemfile +++ b/Gemfile @@ -224,7 +224,7 @@ group :development, :test do gem 'byebug', platform: :mri gem 'climate_control' gem 'debug', '~> 1.8' - gem 'factory_bot_rails', '>= 6.4.2' + gem 'factory_bot_rails', '>= 6.4.3' gem 'listen' gem 'mock_redis' gem 'pry-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 0469be6c9..196a29401 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -230,9 +230,9 @@ GEM facebook-messenger (2.0.1) httparty (~> 0.13, >= 0.13.7) rack (>= 1.4.5) - factory_bot (6.4.2) + factory_bot (6.4.5) activesupport (>= 5.0.0) - factory_bot_rails (6.4.2) + factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) faker (3.2.0) @@ -488,14 +488,14 @@ GEM newrelic_rpm (9.6.0) base64 nio4r (2.6.0) - nokogiri (1.15.5) + nokogiri (1.16.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.15.5-arm64-darwin) + nokogiri (1.16.0-arm64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-darwin) + nokogiri (1.16.0-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) numo-narray (0.9.2.1) oauth (1.1.0) @@ -870,7 +870,7 @@ DEPENDENCIES elastic-apm email_reply_trimmer facebook-messenger - factory_bot_rails (>= 6.4.2) + factory_bot_rails (>= 6.4.3) faker fcm flag_shih_tzu From c6ecf80dfff879f8154c1930bb7efed9a3c961cc Mon Sep 17 00:00:00 2001 From: Sojan Jose Date: Thu, 4 Jan 2024 13:38:03 -0800 Subject: [PATCH 3/5] chore(synk): Upgrade administrate to fix 2 vulnerabilities (#8625) Co-authored-by: snyk-bot Co-authored-by: Pranav Raj S --- Gemfile | 4 ++-- Gemfile.lock | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 3d3299b90..718e90979 100644 --- a/Gemfile +++ b/Gemfile @@ -75,8 +75,8 @@ gem 'jwt' gem 'pundit' # super admin gem 'administrate', '>= 0.19.0' -gem 'administrate-field-active_storage', '>= 1.0.0' -gem 'administrate-field-belongs_to_search' +gem 'administrate-field-active_storage', '>= 1.0.1' +gem 'administrate-field-belongs_to_search', '>= 0.9.0' ##--- gems for pubsub service ---## # https://karolgalanciak.com/blog/2019/11/30/from-activerecord-callbacks-to-publish-slash-subscribe-pattern-and-event-driven-design/ diff --git a/Gemfile.lock b/Gemfile.lock index 196a29401..ebadf20ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,13 +113,13 @@ GEM kaminari (>= 1.0) sassc-rails (~> 2.1) selectize-rails (~> 0.6) - administrate-field-active_storage (1.0.0) + administrate-field-active_storage (1.0.1) administrate (>= 0.2.2) rails (>= 7.0) - administrate-field-belongs_to_search (0.8.0) + administrate-field-belongs_to_search (0.9.0) administrate (>= 0.3, < 1.0) jbuilder (~> 2) - rails (>= 4.2, < 7.1) + rails (>= 4.2, < 7.2) selectize-rails (~> 0.6) annotate (3.2.0) activerecord (>= 3.2, < 8.0) @@ -472,7 +472,7 @@ GEM activerecord (>= 5.2) net-http-persistent (4.0.2) connection_pool (~> 2.2) - net-imap (0.4.5) + net-imap (0.4.9) date net-protocol net-pop (0.1.2) @@ -487,7 +487,7 @@ GEM sidekiq newrelic_rpm (9.6.0) base64 - nio4r (2.6.0) + nio4r (2.7.0) nokogiri (1.16.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) @@ -841,8 +841,8 @@ DEPENDENCIES activerecord-import acts-as-taggable-on administrate (>= 0.19.0) - administrate-field-active_storage (>= 1.0.0) - administrate-field-belongs_to_search + administrate-field-active_storage (>= 1.0.1) + administrate-field-belongs_to_search (>= 0.9.0) annotate attr_extras audited (~> 5.4, >= 5.4.1) From 1f4cb0e1ca80bb004e2f238e897f3ef464daf357 Mon Sep 17 00:00:00 2001 From: Sojan Jose Date: Thu, 4 Jan 2024 15:30:55 -0800 Subject: [PATCH 4/5] chore: add config for Darkmode logo for whitelabeling (#8597) - Add config for dark mode logo --- .../controllers/enterprise/super_admin/app_configs_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb b/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb index c8a42e391..628ac0b3c 100644 --- a/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb +++ b/enterprise/app/controllers/enterprise/super_admin/app_configs_controller.rb @@ -9,6 +9,7 @@ module Enterprise::SuperAdmin::AppConfigsController @allowed_configs = %w[ LOGO_THUMBNAIL LOGO + LOGO_DARK BRAND_NAME INSTALLATION_NAME BRAND_URL From cf90b898f4e182815d0720c868a1279a4966b8fe Mon Sep 17 00:00:00 2001 From: Kevin Lin Date: Thu, 4 Jan 2024 15:34:55 -0800 Subject: [PATCH 5/5] feat: enable new relic log decorations (#8616) This enables local decorating of logs when using a new relic. It can be used when you use a log forwarding agent to do additional enrichment on APM logs before forwarding to the new relic. --- config/newrelic.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/newrelic.yml b/config/newrelic.yml index f07ea34e6..847b693da 100644 --- a/config/newrelic.yml +++ b/config/newrelic.yml @@ -30,7 +30,7 @@ common: &default_settings enabled: <%= ENV.fetch('NEW_RELIC_APPLICATION_LOGGING_ENABLED', false) %> forwarding: # If `true`, the agent captures log records emitted by this application. - enabled: true + enabled: <%= ENV.fetch('NEW_RELIC_APPLICATION_LOGGING_FORWARDING_ENABLED', true) %> # Defines the maximum number of log records to buffer in memory at a time. max_samples_stored: 30000 metrics: @@ -40,7 +40,7 @@ common: &default_settings # If `true`, the agent decorates logs with metadata to link to entities, hosts, traces, and spans. # This requires a log forwarder to send your log files to New Relic. # This should not be used when forwarding is enabled. - enabled: false + enabled: <%= ENV.fetch('NEW_RELIC_APPLICATION_LOGGING_DECORATING_ENABLED', false) %> # Environment-specific settings are in this section.