From a967e06726ac9aeae9bb9bb54a05d5c1dbcca583 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Wed, 5 Jul 2023 09:24:41 +0100 Subject: [PATCH 01/13] DO NOT MERGE testing a fix in the gem --- Gemfile | 2 +- Gemfile.lock | 228 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 217 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index 5d43025c6..c1f95cced 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem "dalli" gem "gds-api-adapters" gem "govuk_ab_testing" gem "govuk_app_config" -gem "govuk_publishing_components" +gem "govuk_publishing_components", git: 'https://github.com/alphagov/govuk_publishing_components.git', branch: 'fix-audit-links' gem "rest-client" gem "sassc-rails" gem "slimmer" diff --git a/Gemfile.lock b/Gemfile.lock index dc318483d..08dbdb544 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,17 @@ +GIT + remote: https://github.com/alphagov/govuk_publishing_components.git + revision: 4010ffd3ee5d46755c53acd53465601d96418c8f + branch: fix-audit-links + specs: + govuk_publishing_components (35.9.0) + govuk_app_config + govuk_personalisation (>= 0.7.0) + kramdown + plek + rails (>= 6) + rouge + sprockets (>= 3) + GEM remote: https://rubygems.org/ specs: @@ -153,9 +167,15 @@ GEM rest-client (~> 2.0) globalid (1.1.0) activesupport (>= 5.0) + google-protobuf (3.23.3) + googleapis-common-protos-types (1.6.0) + google-protobuf (~> 3.14) govuk_ab_testing (2.4.3) - govuk_app_config (8.0.2) + govuk_app_config (8.1.1) logstasher (~> 2.1) + opentelemetry-exporter-otlp (~> 0.25.0) + opentelemetry-instrumentation-all (~> 0.39.1) + opentelemetry-sdk (~> 1.2) plek (>= 4, < 6) prometheus_exporter (~> 2.0) puma (>= 5.6, < 7.0) @@ -166,14 +186,6 @@ GEM govuk_personalisation (0.13.0) plek (>= 1.9.0) rails (>= 6, < 8) - govuk_publishing_components (35.8.0) - govuk_app_config - govuk_personalisation (>= 0.7.0) - kramdown - plek - rails (>= 6) - rouge - sprockets (>= 3) govuk_schemas (4.6.0) json-schema (>= 2.8, < 4.1) govuk_test (3.0.1) @@ -235,6 +247,196 @@ GEM mini_portile2 (~> 2.8.2) racc (~> 1.4) null_logger (0.0.1) + opentelemetry-api (1.1.0) + opentelemetry-common (0.19.7) + opentelemetry-api (~> 1.0) + opentelemetry-exporter-otlp (0.25.0) + google-protobuf (~> 3.19) + googleapis-common-protos-types (~> 1.3) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.19.6) + opentelemetry-sdk (~> 1.2) + opentelemetry-semantic_conventions + opentelemetry-instrumentation-action_pack (0.7.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (~> 0.21) + opentelemetry-instrumentation-action_view (0.6.0) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-active_support (~> 0.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_job (0.5.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_model_serializers (0.20.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-active_record (0.6.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + ruby2_keywords + opentelemetry-instrumentation-active_support (0.4.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-all (0.39.1) + opentelemetry-instrumentation-active_model_serializers (~> 0.20.1) + opentelemetry-instrumentation-aws_sdk (~> 0.4.1) + opentelemetry-instrumentation-bunny (~> 0.20.1) + opentelemetry-instrumentation-concurrent_ruby (~> 0.21.1) + opentelemetry-instrumentation-dalli (~> 0.24.1) + opentelemetry-instrumentation-delayed_job (~> 0.20.1) + opentelemetry-instrumentation-ethon (~> 0.21.1) + opentelemetry-instrumentation-excon (~> 0.21.1) + opentelemetry-instrumentation-faraday (~> 0.23.1) + opentelemetry-instrumentation-grape (~> 0.1.3) + opentelemetry-instrumentation-graphql (~> 0.26.2) + opentelemetry-instrumentation-http (~> 0.23.1) + opentelemetry-instrumentation-http_client (~> 0.22.1) + opentelemetry-instrumentation-koala (~> 0.20.1) + opentelemetry-instrumentation-lmdb (~> 0.22.1) + opentelemetry-instrumentation-mongo (~> 0.22.1) + opentelemetry-instrumentation-mysql2 (~> 0.24.2) + opentelemetry-instrumentation-net_http (~> 0.22.1) + opentelemetry-instrumentation-pg (~> 0.25.2) + opentelemetry-instrumentation-que (~> 0.6.1) + opentelemetry-instrumentation-racecar (~> 0.2.1) + opentelemetry-instrumentation-rack (~> 0.23.1) + opentelemetry-instrumentation-rails (~> 0.27.1) + opentelemetry-instrumentation-rake (~> 0.2.1) + opentelemetry-instrumentation-rdkafka (~> 0.3.1) + opentelemetry-instrumentation-redis (~> 0.25.1) + opentelemetry-instrumentation-resque (~> 0.4.1) + opentelemetry-instrumentation-restclient (~> 0.22.1) + opentelemetry-instrumentation-ruby_kafka (~> 0.20.1) + opentelemetry-instrumentation-sidekiq (~> 0.24.1) + opentelemetry-instrumentation-sinatra (~> 0.23.1) + opentelemetry-instrumentation-trilogy (~> 0.56.1) + opentelemetry-instrumentation-aws_sdk (0.4.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-base (0.22.1) + opentelemetry-api (~> 1.0) + opentelemetry-registry (~> 0.1) + opentelemetry-instrumentation-bunny (0.20.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-concurrent_ruby (0.21.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-dalli (0.24.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-delayed_job (0.20.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-ethon (0.21.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-excon (0.21.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-faraday (0.23.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-grape (0.1.3) + opentelemetry-api (~> 1.1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (~> 0.21) + opentelemetry-instrumentation-graphql (0.26.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http (0.23.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-http_client (0.22.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-koala (0.20.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-lmdb (0.22.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-mongo (0.22.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-mysql2 (0.24.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-net_http (0.22.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-pg (0.25.2) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-que (0.6.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-racecar (0.2.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (0.23.2) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rails (0.27.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-action_pack (~> 0.7.0) + opentelemetry-instrumentation-action_view (~> 0.6.0) + opentelemetry-instrumentation-active_job (~> 0.5.1) + opentelemetry-instrumentation-active_record (~> 0.6.1) + opentelemetry-instrumentation-active_support (~> 0.4.1) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rake (0.2.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rdkafka (0.3.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-redis (0.25.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-resque (0.4.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-restclient (0.22.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-ruby_kafka (0.20.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-sidekiq (0.24.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-sinatra (0.23.1) + opentelemetry-api (~> 1.0) + opentelemetry-common (~> 0.19.3) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-instrumentation-rack (~> 0.21) + opentelemetry-instrumentation-trilogy (0.56.1) + opentelemetry-api (~> 1.0) + opentelemetry-instrumentation-base (~> 0.22.1) + opentelemetry-semantic_conventions (>= 1.8.0) + opentelemetry-registry (0.3.0) + opentelemetry-api (~> 1.1) + opentelemetry-sdk (1.2.1) + opentelemetry-api (~> 1.1) + opentelemetry-common (~> 0.19.3) + opentelemetry-registry (~> 0.2) + opentelemetry-semantic_conventions + opentelemetry-semantic_conventions (1.10.0) + opentelemetry-api (~> 1.0) parallel (1.22.1) parser (3.2.0.0) ast (~> 2.4.1) @@ -274,8 +476,9 @@ GEM actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.1.1) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) rails-html-sanitizer (1.6.0) loofah (~> 2.21) @@ -349,6 +552,7 @@ GEM rubocop (~> 1.33) rubocop-capybara (~> 2.17) ruby-progressbar (1.11.0) + ruby2_keywords (0.0.5) rubyzip (2.3.2) sassc (2.4.0) ffi (~> 1.9) @@ -434,7 +638,7 @@ DEPENDENCIES gds-api-adapters govuk_ab_testing govuk_app_config - govuk_publishing_components + govuk_publishing_components! govuk_schemas govuk_test launchy From 67e495c0b01ab616d15cbe7426935b6feff3185f Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Wed, 5 Jul 2023 09:58:58 +0100 Subject: [PATCH 02/13] Trigger --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index c1f95cced..d8fee9ed8 100644 --- a/Gemfile +++ b/Gemfile @@ -42,3 +42,5 @@ group :test do gem "timecop" gem "webmock" end + +# test \ No newline at end of file From d5ba021a75ffd67e4a3891cbf960c8cedf7c9649 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Wed, 5 Jul 2023 11:35:00 +0100 Subject: [PATCH 03/13] WIP add config --- Gemfile.lock | 2 +- config/initializers/govuk_publishing_components.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 08dbdb544..4fb7bc07b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/alphagov/govuk_publishing_components.git - revision: 4010ffd3ee5d46755c53acd53465601d96418c8f + revision: 9db03c3415effdd1c36444338373779cd5aca5b1 branch: fix-audit-links specs: govuk_publishing_components (35.9.0) diff --git a/config/initializers/govuk_publishing_components.rb b/config/initializers/govuk_publishing_components.rb index 564f366c3..d6a57146b 100644 --- a/config/initializers/govuk_publishing_components.rb +++ b/config/initializers/govuk_publishing_components.rb @@ -1,3 +1,4 @@ GovukPublishingComponents.configure do |c| c.component_guide_title = "Finder Frontend Component Guide" + c.application_name = "finder-frontend" end From 38b4611c7e63f99da089ae7a2e65cbd5b06b1d38 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Wed, 5 Jul 2023 11:41:21 +0100 Subject: [PATCH 04/13] WIP debug --- Gemfile.lock | 2 +- config/initializers/govuk_publishing_components.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4fb7bc07b..9874a3559 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/alphagov/govuk_publishing_components.git - revision: 9db03c3415effdd1c36444338373779cd5aca5b1 + revision: 02e710585929c11dad81ee14457abff541904efd branch: fix-audit-links specs: govuk_publishing_components (35.9.0) diff --git a/config/initializers/govuk_publishing_components.rb b/config/initializers/govuk_publishing_components.rb index d6a57146b..564f366c3 100644 --- a/config/initializers/govuk_publishing_components.rb +++ b/config/initializers/govuk_publishing_components.rb @@ -1,4 +1,3 @@ GovukPublishingComponents.configure do |c| c.component_guide_title = "Finder Frontend Component Guide" - c.application_name = "finder-frontend" end From b1474249360f2de50e36ad8ea22f9e08496a2a99 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Wed, 5 Jul 2023 12:28:12 +0100 Subject: [PATCH 05/13] WIP --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9874a3559..534eb6467 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/alphagov/govuk_publishing_components.git - revision: 02e710585929c11dad81ee14457abff541904efd + revision: 71ae66db92d7a220667b6f6a32d8ef84102f232a branch: fix-audit-links specs: govuk_publishing_components (35.9.0) @@ -171,7 +171,7 @@ GEM googleapis-common-protos-types (1.6.0) google-protobuf (~> 3.14) govuk_ab_testing (2.4.3) - govuk_app_config (8.1.1) + govuk_app_config (9.0.0) logstasher (~> 2.1) opentelemetry-exporter-otlp (~> 0.25.0) opentelemetry-instrumentation-all (~> 0.39.1) From 6d73beb814c1fff74f10c8ffeff388a7c5304444 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Wed, 5 Jul 2023 13:23:28 +0100 Subject: [PATCH 06/13] WIP debug --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 534eb6467..19c7348be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/alphagov/govuk_publishing_components.git - revision: 71ae66db92d7a220667b6f6a32d8ef84102f232a + revision: b092ac1e3f36cc6591e7a2e7672d6432efe263da branch: fix-audit-links specs: govuk_publishing_components (35.9.0) From e08bca66fd3338ad7e9af580a5e94f42140ac83d Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Wed, 5 Jul 2023 14:07:38 +0100 Subject: [PATCH 07/13] WIP --- Gemfile | 2 -- Gemfile.lock | 2 +- config/initializers/govuk_publishing_components.rb | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index d8fee9ed8..c1f95cced 100644 --- a/Gemfile +++ b/Gemfile @@ -42,5 +42,3 @@ group :test do gem "timecop" gem "webmock" end - -# test \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 19c7348be..1951b84a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/alphagov/govuk_publishing_components.git - revision: b092ac1e3f36cc6591e7a2e7672d6432efe263da + revision: d41bc3229e1bd7994a6b0fb429addc1176b12c19 branch: fix-audit-links specs: govuk_publishing_components (35.9.0) diff --git a/config/initializers/govuk_publishing_components.rb b/config/initializers/govuk_publishing_components.rb index 564f366c3..a5cc597d6 100644 --- a/config/initializers/govuk_publishing_components.rb +++ b/config/initializers/govuk_publishing_components.rb @@ -1,3 +1,4 @@ GovukPublishingComponents.configure do |c| c.component_guide_title = "Finder Frontend Component Guide" + # c.application_dir = "finder-frontend" end From fe896cede0aef5d9ee86e9be2b34884f707c51e4 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Wed, 5 Jul 2023 14:10:32 +0100 Subject: [PATCH 08/13] WIP add correct config --- config/initializers/govuk_publishing_components.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/govuk_publishing_components.rb b/config/initializers/govuk_publishing_components.rb index a5cc597d6..4548e61f6 100644 --- a/config/initializers/govuk_publishing_components.rb +++ b/config/initializers/govuk_publishing_components.rb @@ -1,4 +1,4 @@ GovukPublishingComponents.configure do |c| c.component_guide_title = "Finder Frontend Component Guide" - # c.application_dir = "finder-frontend" + c.application_dir = "finder-frontend" end From 77685f481c35e99037e3ba029cde7f53a5a5db91 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Wed, 5 Jul 2023 14:56:19 +0100 Subject: [PATCH 09/13] WIP --- Gemfile.lock | 2 +- config/initializers/govuk_publishing_components.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1951b84a2..d1ff738f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/alphagov/govuk_publishing_components.git - revision: d41bc3229e1bd7994a6b0fb429addc1176b12c19 + revision: 5739fa255f02745d51de40dcde04aec606882607 branch: fix-audit-links specs: govuk_publishing_components (35.9.0) diff --git a/config/initializers/govuk_publishing_components.rb b/config/initializers/govuk_publishing_components.rb index 4548e61f6..a5cc597d6 100644 --- a/config/initializers/govuk_publishing_components.rb +++ b/config/initializers/govuk_publishing_components.rb @@ -1,4 +1,4 @@ GovukPublishingComponents.configure do |c| c.component_guide_title = "Finder Frontend Component Guide" - c.application_dir = "finder-frontend" + # c.application_dir = "finder-frontend" end From d650f652754cef2c46edf07ad957a6528a01bd30 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Wed, 5 Jul 2023 15:26:08 +0100 Subject: [PATCH 10/13] WIP --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d1ff738f2..2207a5e2a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/alphagov/govuk_publishing_components.git - revision: 5739fa255f02745d51de40dcde04aec606882607 + revision: 7c561385d119a550a6a1946fc64adeaced87b4a3 branch: fix-audit-links specs: govuk_publishing_components (35.9.0) From 3f1044a69cf100a8cf1cb49cb111dfe5568d292c Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Wed, 5 Jul 2023 15:28:25 +0100 Subject: [PATCH 11/13] WIP some more --- config/initializers/govuk_publishing_components.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/govuk_publishing_components.rb b/config/initializers/govuk_publishing_components.rb index a5cc597d6..4548e61f6 100644 --- a/config/initializers/govuk_publishing_components.rb +++ b/config/initializers/govuk_publishing_components.rb @@ -1,4 +1,4 @@ GovukPublishingComponents.configure do |c| c.component_guide_title = "Finder Frontend Component Guide" - # c.application_dir = "finder-frontend" + c.application_dir = "finder-frontend" end From 53533bc88d0a632e51a89dc7efedd2a53d31a6bd Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Wed, 5 Jul 2023 15:36:18 +0100 Subject: [PATCH 12/13] WIP --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2207a5e2a..136a47b3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/alphagov/govuk_publishing_components.git - revision: 7c561385d119a550a6a1946fc64adeaced87b4a3 + revision: d9a0aeae4c4ed4ca88659bac89cb467827be22ae branch: fix-audit-links specs: govuk_publishing_components (35.9.0) From 3637d62bd4f6baf0dba4e2404d07316933ba4be1 Mon Sep 17 00:00:00 2001 From: Andy Sellick Date: Wed, 5 Jul 2023 15:58:49 +0100 Subject: [PATCH 13/13] WIP --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 136a47b3d..832cb810c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/alphagov/govuk_publishing_components.git - revision: d9a0aeae4c4ed4ca88659bac89cb467827be22ae + revision: 80ee24b89d1c6e48357363118b35d402eed63f5d branch: fix-audit-links specs: govuk_publishing_components (35.9.0) @@ -171,7 +171,7 @@ GEM googleapis-common-protos-types (1.6.0) google-protobuf (~> 3.14) govuk_ab_testing (2.4.3) - govuk_app_config (9.0.0) + govuk_app_config (9.0.1) logstasher (~> 2.1) opentelemetry-exporter-otlp (~> 0.25.0) opentelemetry-instrumentation-all (~> 0.39.1) @@ -243,7 +243,7 @@ GEM net-protocol netrc (0.11.0) nio4r (2.5.9) - nokogiri (1.15.2) + nokogiri (1.15.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) null_logger (0.0.1)