From abecde96a4575db54ba7356a57fc8827af2c90c0 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Thu, 5 Sep 2024 15:50:57 +0100 Subject: [PATCH 1/2] build: application configuration unification Moved all mirrored configuration settings from individual environments into the application configuration to reduce the need to manage multiple sources --- config/application.rb | 10 ++++++++++ config/environments/development.rb | 10 ---------- config/environments/production.rb | 10 ---------- config/environments/test.rb | 10 ---------- 4 files changed, 10 insertions(+), 30 deletions(-) diff --git a/config/application.rb b/config/application.rb index 9a152c0e..5c89d07f 100644 --- a/config/application.rb +++ b/config/application.rb @@ -26,6 +26,16 @@ class Application < Rails::Application # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. + # feature flag for showing the Welsh language switch affordance + config.welsh_language_enabled = true + + # Use default paths for documentation. + config.accessibility_document_path = '/accessibility' + config.privacy_document_path = '/privacy' + + # Set the contact email address to Land Registry supplied address + config.contact_email_address = 'data.services@mail.landregistry.gov.uk' + # 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 = 'Central Time (US & Canada)' diff --git a/config/environments/development.rb b/config/environments/development.rb index ecf0726c..fcaae2d8 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -53,14 +53,4 @@ # API location can be specified in the environment but defaults to the dev service config.api_service_url = ENV.fetch('API_SERVICE_URL', 'http://localhost:8888') - - # feature flag for showing the Welsh language switch affordance - config.welsh_language_enabled = true - - # Use default paths for documentation. - config.accessibility_document_path = '/doc/accessibility' - config.privacy_document_path = '/doc/privacy' - - # Set the contact email address to Land Registry supplied address - config.contact_email_address = 'data.services@mail.landregistry.gov.uk' end diff --git a/config/environments/production.rb b/config/environments/production.rb index e23238fa..38d2a375 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -92,14 +92,4 @@ # API location is specified in the environment variable API_SERVICE_URL config.api_service_url = ENV.fetch('API_SERVICE_URL', nil) - - # feature flag for showing the Welsh language switch affordance - config.welsh_language_enabled = true - - # Use default paths for documentation. - config.accessibility_document_path = '/accessibility' - config.privacy_document_path = '/privacy' - - # Set the contact email address to Land Registry supplied address - config.contact_email_address = 'data.services@mail.landregistry.gov.uk' end diff --git a/config/environments/test.rb b/config/environments/test.rb index 3b6f2517..cfe3a61f 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -47,14 +47,4 @@ # API location can be specified in the environment # But defaults to the dev service config.api_service_url = ENV.fetch('API_SERVICE_URL', 'http://localhost:8080') - - # Use default paths for documentation. - config.accessibility_document_path = '/doc/accessibility' - config.privacy_document_path = '/doc/privacy' - - # feature flag for showing the Welsh language switch affordance - config.welsh_language_enabled = true - - # Set the contact email address to Land Registry supplied address - config.contact_email_address = 'data.services@mail.landregistry.gov.uk' end From 5d53960956461b19c605a87397a41446fdd127c4 Mon Sep 17 00:00:00 2001 From: "Jon R. Humphrey" Date: Thu, 5 Sep 2024 15:51:10 +0100 Subject: [PATCH 2/2] docs: updated CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b62cf6d7..21035496 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 1.7.5 - 2024-09 +- (Jon) Moved all mirrored configuration settings from individual environments + into the application configuration to reduce the need to manage multiple + sources of truth - (Jon) Actioned all of the outstanding updates contained within the dependabot #443 PR as well as all updates implemented via yarn upgrade-interactive thus bringing the application to the highest level of update available at this time