From 2b9f01d9e69448b808430421d888dcd5d84f3e49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 17:01:01 +0000 Subject: [PATCH 1/2] Bump govuk_app_config from 9.13.1 to 9.14.0 Bumps [govuk_app_config](https://github.com/alphagov/govuk_app_config) from 9.13.1 to 9.14.0. - [Changelog](https://github.com/alphagov/govuk_app_config/blob/main/CHANGELOG.md) - [Commits](https://github.com/alphagov/govuk_app_config/compare/v9.13.1...v9.14.0) --- updated-dependencies: - dependency-name: govuk_app_config dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9dff0596..55629179 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -185,10 +185,10 @@ GEM jquery-rails (~> 4.3) plek (>= 2.1) rails (>= 6) - govuk_app_config (9.13.1) + govuk_app_config (9.14.0) logstasher (~> 2.1) opentelemetry-exporter-otlp (>= 0.25, < 0.29) - opentelemetry-instrumentation-all (>= 0.39.1, < 0.62.0) + opentelemetry-instrumentation-all (>= 0.39.1, < 0.63.0) opentelemetry-sdk (~> 1.2) plek (>= 4, < 6) prometheus_exporter (~> 2.0) @@ -353,10 +353,10 @@ GEM opentelemetry-instrumentation-active_record (0.7.2) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-active_support (0.5.3) + opentelemetry-instrumentation-active_support (0.6.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-all (0.61.0) + opentelemetry-instrumentation-all (0.62.1) opentelemetry-instrumentation-active_model_serializers (~> 0.20.1) opentelemetry-instrumentation-aws_lambda (~> 0.1.0) opentelemetry-instrumentation-aws_sdk (~> 0.5.0) @@ -367,7 +367,7 @@ GEM opentelemetry-instrumentation-ethon (~> 0.21.1) opentelemetry-instrumentation-excon (~> 0.22.0) opentelemetry-instrumentation-faraday (~> 0.24.0) - opentelemetry-instrumentation-grape (~> 0.1.3) + opentelemetry-instrumentation-grape (~> 0.2.0) opentelemetry-instrumentation-graphql (~> 0.28.0) opentelemetry-instrumentation-gruf (~> 0.2.0) opentelemetry-instrumentation-http (~> 0.23.1) @@ -381,7 +381,7 @@ GEM opentelemetry-instrumentation-que (~> 0.8.0) opentelemetry-instrumentation-racecar (~> 0.3.0) opentelemetry-instrumentation-rack (~> 0.24.0) - opentelemetry-instrumentation-rails (~> 0.30.0) + opentelemetry-instrumentation-rails (~> 0.31.0) opentelemetry-instrumentation-rake (~> 0.2.1) opentelemetry-instrumentation-rdkafka (~> 0.4.0) opentelemetry-instrumentation-redis (~> 0.25.1) @@ -389,7 +389,7 @@ GEM opentelemetry-instrumentation-restclient (~> 0.22.1) opentelemetry-instrumentation-ruby_kafka (~> 0.21.0) opentelemetry-instrumentation-sidekiq (~> 0.25.0) - opentelemetry-instrumentation-sinatra (~> 0.23.1) + opentelemetry-instrumentation-sinatra (~> 0.24.0) opentelemetry-instrumentation-trilogy (~> 0.59.0) opentelemetry-instrumentation-aws_lambda (0.1.0) opentelemetry-api (~> 1.0) @@ -422,7 +422,7 @@ GEM opentelemetry-instrumentation-faraday (0.24.6) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-grape (0.1.8) + opentelemetry-instrumentation-grape (0.2.0) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) @@ -468,14 +468,14 @@ GEM opentelemetry-instrumentation-rack (0.24.6) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-rails (0.30.2) + opentelemetry-instrumentation-rails (0.31.1) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-action_mailer (~> 0.1.0) opentelemetry-instrumentation-action_pack (~> 0.9.0) opentelemetry-instrumentation-action_view (~> 0.7.0) opentelemetry-instrumentation-active_job (~> 0.7.0) opentelemetry-instrumentation-active_record (~> 0.7.0) - opentelemetry-instrumentation-active_support (~> 0.5.0) + opentelemetry-instrumentation-active_support (~> 0.6.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rake (0.2.2) opentelemetry-api (~> 1.0) @@ -498,7 +498,7 @@ GEM opentelemetry-instrumentation-sidekiq (0.25.7) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) - opentelemetry-instrumentation-sinatra (0.23.5) + opentelemetry-instrumentation-sinatra (0.24.1) opentelemetry-api (~> 1.0) opentelemetry-instrumentation-base (~> 0.22.1) opentelemetry-instrumentation-rack (~> 0.21) From 71f1c975137063cc0f64d624775cb8be376367d2 Mon Sep 17 00:00:00 2001 From: Richard Towers Date: Fri, 2 Aug 2024 15:42:42 +0100 Subject: [PATCH 2/2] Use config.govuk_time_zone govuk_app_config insists on this now. We could remove this config, as London is already the default, but Guido says explicit is better than implicit. --- config/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index 531f2e24..4653f3ca 100644 --- a/config/application.rb +++ b/config/application.rb @@ -39,7 +39,7 @@ class Application < Rails::Application # These settings can be overridden in specific environments using the files # in config/environments, which are processed later. - config.time_zone = "London" + config.govuk_time_zone = "London" # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]