Skip to content

Commit

Permalink
Merge pull request #2263 from alphagov/dependabot/bundler/govuk_app_c…
Browse files Browse the repository at this point in the history
…onfig-9.14.0

Bump govuk_app_config from 9.13.1 to 9.14.0
  • Loading branch information
davidtrussler authored Aug 9, 2024
2 parents 079b3be + 921cb61 commit f0bada9
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,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)
Expand Down Expand Up @@ -425,10 +425,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)
Expand All @@ -439,7 +439,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)
Expand All @@ -453,15 +453,15 @@ 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)
opentelemetry-instrumentation-resque (~> 0.5.0)
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)
Expand Down Expand Up @@ -494,7 +494,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)
Expand Down Expand Up @@ -540,14 +540,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)
Expand All @@ -570,7 +570,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)
Expand Down
4 changes: 2 additions & 2 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ class Application < Rails::Application
config.action_dispatch.rack_cache = nil

# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
config.time_zone = "London"
# Run "rake -D time" for a list of tasks for finding time zone names. Default set by govuk_app_config is London.
config.govuk_time_zone = "London"

# Enforce locale restriction to silence deprecation warnings; this will be
# the default in future Rails versions.
Expand Down

0 comments on commit f0bada9

Please sign in to comment.