From c5d2991f46e75923b78d6e186c5e2919dc80b8a3 Mon Sep 17 00:00:00 2001 From: Michael Squance Date: Mon, 10 Mar 2025 16:54:16 +0000 Subject: [PATCH 1/2] Updating solargraph to stop it popping up to say it needs updating Removing references to cluster on the secondary toolkit page and from the cqf banner --- Gemfile.lock | 53 +++++++++++-------- .../_computing_quality_framework.html.erb | 3 -- app/views/pages/secondary-toolkit.html.erb | 3 +- .../views/pages/secondary-toolkit/en.yml | 2 +- 4 files changed, 32 insertions(+), 29 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 30015603a6..eab36e7111 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -193,7 +193,7 @@ GEM debug_inspector (1.2.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - diff-lcs (1.5.1) + diff-lcs (1.6.0) docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -230,7 +230,6 @@ GEM dry-logic (~> 1.4) zeitwerk (~> 2.6) dumb_delegator (0.8.1) - e2mmap (0.1.0) encryptor (3.0.0) enumerize (2.7.0) activesupport (>= 3.2) @@ -321,13 +320,13 @@ GEM pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - jaro_winkler (1.5.6) + jaro_winkler (1.6.0) jmespath (1.6.2) jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.7.1) + json (2.10.1) jwt (2.7.1) kaminari (1.2.2) activesupport (>= 4.1.0) @@ -341,11 +340,11 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kramdown (2.4.0) - rexml + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - language_server-protocol (3.17.0.3) + language_server-protocol (3.17.0.4) lint_roller (1.1.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) @@ -409,6 +408,7 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) + observer (0.1.2) omniauth (2.1.2) hashie (>= 3.4.6) rack (>= 2.2.3) @@ -422,9 +422,10 @@ GEM omniauth-rails_csrf_protection (1.0.1) actionpack (>= 4.2) omniauth (~> 2.0) + ostruct (0.6.1) pagy (6.4.3) - parallel (1.24.0) - parser (3.3.5.0) + parallel (1.26.3) + parser (3.3.7.1) ast (~> 2.4.1) racc pdf-core (0.9.0) @@ -521,7 +522,8 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (2.8.4) + rbs (3.8.1) + logger rdoc (6.12.0) psych (>= 4.0.0) redis-client (0.23.2) @@ -531,7 +533,7 @@ GEM parser (~> 3.3.0) rainbow (>= 2.0, < 4.0) rexml (~> 3.1) - regexp_parser (2.9.0) + regexp_parser (2.10.0) reline (0.6.0) io-console (~> 0.5) request_store (1.7.0) @@ -541,9 +543,9 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - reverse_markdown (2.1.1) + reverse_markdown (3.0.0) nokogiri - rexml (3.3.9) + rexml (3.4.1) rouge (4.2.0) rspec (3.13.0) rspec-core (~> 3.13.0) @@ -580,8 +582,8 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.38.1) + parser (>= 3.3.1.0) rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) @@ -644,22 +646,25 @@ GEM snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) - solargraph (0.49.0) + solargraph (0.52.0) backport (~> 1.2) benchmark bundler (~> 2.0) diff-lcs (~> 1.4) - e2mmap - jaro_winkler (~> 1.5) + jaro_winkler (~> 1.6) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1) + logger (~> 1.6) + observer (~> 0.1) + ostruct (~> 0.6) parser (~> 3.0) - rbs (~> 2.0) - reverse_markdown (~> 2.0) + rbs (~> 3.0) + reverse_markdown (>= 2.0, < 4) rubocop (~> 1.38) thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) + yard-solargraph (~> 0.1) spring (4.1.1) spring-watcher-listen (2.1.0) listen (>= 2.7, < 4.0) @@ -693,7 +698,7 @@ GEM execjs (>= 0.3.0, < 3) thor (1.3.2) thread_safe (0.3.6) - tilt (2.2.0) + tilt (2.6.0) timecop (0.9.8) timeout (0.4.3) ttfunk (1.7.0) @@ -707,7 +712,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.5.0) + unicode-display_width (2.6.0) uniform_notifier (1.16.0) uri (1.0.2) version_gem (1.1.3) @@ -743,7 +748,9 @@ GEM railties (>= 3.0.7) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.36) + yard (0.9.37) + yard-solargraph (0.1.0) + yard (~> 0.9) zeitwerk (2.7.1) PLATFORMS diff --git a/app/views/pages/_computing_quality_framework.html.erb b/app/views/pages/_computing_quality_framework.html.erb index 494eb111d8..d489651fdb 100644 --- a/app/views/pages/_computing_quality_framework.html.erb +++ b/app/views/pages/_computing_quality_framework.html.erb @@ -16,9 +16,6 @@ target: "_blank" %> -

- You can also join a <%= link_to 'Computing Cluster', cms_page_path("computing-clusters") %> to work collaboratively with other schools to improve your computing provision. -

<%= link_to 'Register now', 'https://computingqualityframework.org/', class: 'button govuk-button computing-quality-framework__button', diff --git a/app/views/pages/secondary-toolkit.html.erb b/app/views/pages/secondary-toolkit.html.erb index c94bd7734d..6f68060993 100644 --- a/app/views/pages/secondary-toolkit.html.erb +++ b/app/views/pages/secondary-toolkit.html.erb @@ -37,8 +37,7 @@ class_name: 'bordered-card--toolkit', title: t('.intro.cards.assess.title'), text: t('.intro.cards.assess.text.html', - cqf_link: link_to("Computing Quality Framework", computing_quality_framework_url), - cluster_link: link_to("Computing Cluster", cms_page_path("computing-clusters"))), + cqf_link: link_to("Computing Quality Framework", computing_quality_framework_url)) } ] ) %> diff --git a/config/locales/views/pages/secondary-toolkit/en.yml b/config/locales/views/pages/secondary-toolkit/en.yml index 34cbe04f6a..1e05f954fd 100644 --- a/config/locales/views/pages/secondary-toolkit/en.yml +++ b/config/locales/views/pages/secondary-toolkit/en.yml @@ -18,7 +18,7 @@ en: assess: title: "Assess your school’s computing provision" text: - html: "Self-evaluation is the first step to improvement. The %{cqf_link} helps you identify strengths and weaknesses in your computing curriculum and set actionable goals towards achieving our accredited Computing Quality Mark.

You can also join a %{cluster_link} to work collaboratively with other schools to improve your computing provision." + html: "Self-evaluation is the first step to improvement. The %{cqf_link} helps you identify strengths and weaknesses in your computing curriculum and set actionable goals towards achieving our accredited Computing Quality Mark." supporting: title: "Supporting your GCSE Computer Science provision" para_1: "If you don’t currently offer GCSE Computer Science at your school, we are dedicated to work with you. Our support will help you create a sustainable computing department, improve provision and build capability and confidence –ultimately getting you in a better position to offer this key subject to your students." From 8e15cff83761d4daca588b27536b20817a71c166 Mon Sep 17 00:00:00 2001 From: Michael Squance Date: Tue, 11 Mar 2025 11:42:43 +0000 Subject: [PATCH 2/2] Undo solargraph update as it was causing errors on release --- Gemfile.lock | 53 +++++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index eab36e7111..30015603a6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -193,7 +193,7 @@ GEM debug_inspector (1.2.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - diff-lcs (1.6.0) + diff-lcs (1.5.1) docile (1.4.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -230,6 +230,7 @@ GEM dry-logic (~> 1.4) zeitwerk (~> 2.6) dumb_delegator (0.8.1) + e2mmap (0.1.0) encryptor (3.0.0) enumerize (2.7.0) activesupport (>= 3.2) @@ -320,13 +321,13 @@ GEM pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) - jaro_winkler (1.6.0) + jaro_winkler (1.5.6) jmespath (1.6.2) jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.10.1) + json (2.7.1) jwt (2.7.1) kaminari (1.2.2) activesupport (>= 4.1.0) @@ -340,11 +341,11 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kramdown (2.5.1) - rexml (>= 3.3.9) + kramdown (2.4.0) + rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - language_server-protocol (3.17.0.4) + language_server-protocol (3.17.0.3) lint_roller (1.1.0) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) @@ -408,7 +409,6 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) - observer (0.1.2) omniauth (2.1.2) hashie (>= 3.4.6) rack (>= 2.2.3) @@ -422,10 +422,9 @@ GEM omniauth-rails_csrf_protection (1.0.1) actionpack (>= 4.2) omniauth (~> 2.0) - ostruct (0.6.1) pagy (6.4.3) - parallel (1.26.3) - parser (3.3.7.1) + parallel (1.24.0) + parser (3.3.5.0) ast (~> 2.4.1) racc pdf-core (0.9.0) @@ -522,8 +521,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rbs (3.8.1) - logger + rbs (2.8.4) rdoc (6.12.0) psych (>= 4.0.0) redis-client (0.23.2) @@ -533,7 +531,7 @@ GEM parser (~> 3.3.0) rainbow (>= 2.0, < 4.0) rexml (~> 3.1) - regexp_parser (2.10.0) + regexp_parser (2.9.0) reline (0.6.0) io-console (~> 0.5) request_store (1.7.0) @@ -543,9 +541,9 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - reverse_markdown (3.0.0) + reverse_markdown (2.1.1) nokogiri - rexml (3.4.1) + rexml (3.3.9) rouge (4.2.0) rspec (3.13.0) rspec-core (~> 3.13.0) @@ -582,8 +580,8 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.38.1) - parser (>= 3.3.1.0) + rubocop-ast (1.30.0) + parser (>= 3.2.1.0) rubocop-performance (1.20.2) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.30.0, < 2.0) @@ -646,25 +644,22 @@ GEM snaky_hash (2.0.1) hashie version_gem (~> 1.1, >= 1.1.1) - solargraph (0.52.0) + solargraph (0.49.0) backport (~> 1.2) benchmark bundler (~> 2.0) diff-lcs (~> 1.4) - jaro_winkler (~> 1.6) + e2mmap + jaro_winkler (~> 1.5) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.1) - logger (~> 1.6) - observer (~> 0.1) - ostruct (~> 0.6) parser (~> 3.0) - rbs (~> 3.0) - reverse_markdown (>= 2.0, < 4) + rbs (~> 2.0) + reverse_markdown (~> 2.0) rubocop (~> 1.38) thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) - yard-solargraph (~> 0.1) spring (4.1.1) spring-watcher-listen (2.1.0) listen (>= 2.7, < 4.0) @@ -698,7 +693,7 @@ GEM execjs (>= 0.3.0, < 3) thor (1.3.2) thread_safe (0.3.6) - tilt (2.6.0) + tilt (2.2.0) timecop (0.9.8) timeout (0.4.3) ttfunk (1.7.0) @@ -712,7 +707,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (2.6.0) + unicode-display_width (2.5.0) uniform_notifier (1.16.0) uri (1.0.2) version_gem (1.1.3) @@ -748,9 +743,7 @@ GEM railties (>= 3.0.7) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.37) - yard-solargraph (0.1.0) - yard (~> 0.9) + yard (0.9.36) zeitwerk (2.7.1) PLATFORMS