From c3ff5b49f588788f38395cfcdc151a27ddb8bfb9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 09:34:14 +0000 Subject: [PATCH 1/5] Bump activesupport and jekyll Bumps [activesupport](https://github.com/rails/rails) and [jekyll](https://github.com/jekyll/jekyll). These dependencies needed to be updated together. Updates `activesupport` from 6.0.6.1 to 7.0.4.3 - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v7.0.4.3/activesupport/CHANGELOG.md) - [Commits](https://github.com/rails/rails/compare/v6.0.6.1...v7.0.4.3) Updates `jekyll` from 3.7.4 to 4.3.2 - [Release notes](https://github.com/jekyll/jekyll/releases) - [Changelog](https://github.com/jekyll/jekyll/blob/master/History.markdown) - [Commits](https://github.com/jekyll/jekyll/compare/v3.7.4...v4.3.2) --- updated-dependencies: - dependency-name: activesupport dependency-type: direct:production - dependency-name: jekyll dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 90 ++++++++++++++++++++++++++++------------------------ 2 files changed, 50 insertions(+), 42 deletions(-) diff --git a/Gemfile b/Gemfile index 4e59aca..00d40fb 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ source "https://rubygems.org" # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "~> 3.7.0" +gem "jekyll", "~> 4.3.2" # This is the default theme for new Jekyll sites. You may change this to anything you like. gem "minima", "~> 2.0" diff --git a/Gemfile.lock b/Gemfile.lock index bf04a3a..dd76ed6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,89 +1,97 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.6.1) + activesupport (7.0.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + addressable (2.8.4) + public_suffix (>= 2.0.2, < 6.0) airtable (0.0.9) httparty bigdecimal (1.4.4) colorator (1.1.0) - concurrent-ruby (1.2.0) + concurrent-ruby (1.2.2) dotenv (2.7.6) - em-websocket (0.5.1) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) + http_parser.rb (~> 0) eventmachine (1.2.7) eventmachine (1.2.7-x64-mingw32) - ffi (1.11.1) - ffi (1.11.1-x64-mingw32) + ffi (1.15.5) forwardable-extended (2.6.0) - http_parser.rb (0.6.0) + google-protobuf (3.22.2) + http_parser.rb (0.8.0) httparty (0.21.0) mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) - i18n (0.9.5) + i18n (1.12.0) concurrent-ruby (~> 1.0) - jekyll (3.7.4) + jekyll (4.3.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) + i18n (~> 1.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (~> 2.3, >= 2.3.1) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) jekyll-feed (0.12.1) jekyll (>= 3.7, < 5.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) jekyll-seo-tag (2.6.1) jekyll (>= 3.3, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) json (2.3.0) - kramdown (1.17.0) - liquid (4.0.3) - listen (3.2.0) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.4) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) + mercenary (0.4.0) mini_mime (1.1.2) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.17.0) + minitest (5.18.0) multi_xml (0.6.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.1) + public_suffix (5.0.1) rake (13.0.1) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) ffi (~> 1.0) - rouge (3.12.0) + rexml (3.2.5) + rouge (4.1.0) safe_yaml (1.0.5) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - thread_safe (0.3.6) - tzinfo (1.2.11) - thread_safe (~> 0.1) + sass-embedded (1.62.0) + google-protobuf (~> 3.21) + rake (>= 10.0.0) + sass-embedded (1.62.0-x64-mingw32) + google-protobuf (~> 3.21) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) tzinfo-data (1.2019.3) tzinfo (>= 1.0.0) - zeitwerk (2.6.6) + unicode-display_width (2.4.2) + webrick (1.8.1) PLATFORMS ruby @@ -94,7 +102,7 @@ DEPENDENCIES airtable bigdecimal dotenv (~> 2.7.0) - jekyll (~> 3.7.0) + jekyll (~> 4.3.2) jekyll-feed (~> 0.6) json (~> 2.3) minima (~> 2.0) From 0cb5b323182e3a816f0ffec4b3a7283ffc4af3eb Mon Sep 17 00:00:00 2001 From: David Kane Date: Wed, 12 Apr 2023 15:33:55 +0100 Subject: [PATCH 2/5] add in old google tag code --- source/_layouts/default.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/_layouts/default.html b/source/_layouts/default.html index 9cc7604..4ad33ee 100644 --- a/source/_layouts/default.html +++ b/source/_layouts/default.html @@ -10,6 +10,14 @@ gtag('js', new Date()); gtag('config', 'G-00SMLJ2GJL'); + + From e10d2b9fbafb4fb0974110d1e2ccc6ab14084235 Mon Sep 17 00:00:00 2001 From: David Kane Date: Wed, 12 Apr 2023 15:41:51 +0100 Subject: [PATCH 3/5] update jekyll-sass-converter --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 00d40fb..37fbe67 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,7 @@ source "https://rubygems.org" # This will help ensure the proper Jekyll version is running. # Happy Jekylling! gem "jekyll", "~> 4.3.2" +gem "jekyll-sass-converter", "~> 2.0" # This is the default theme for new Jekyll sites. You may change this to anything you like. gem "minima", "~> 2.0" From d5bef657e888fa3efdf7c549ae7aba2b627d813d Mon Sep 17 00:00:00 2001 From: Bibiana Cristofol Amat Date: Thu, 5 Feb 2026 08:35:04 +0000 Subject: [PATCH 4/5] update charity number --- source/_includes/_footer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/_includes/_footer.html b/source/_includes/_footer.html index 4f69e13..47b054a 100644 --- a/source/_includes/_footer.html +++ b/source/_includes/_footer.html @@ -54,7 +54,7 @@

360Giving

-

360Giving: Company 09668396 Charity 1164883

+

360Giving: Company 09668396 Charity 1116201

Privacy Notice | Terms & Conditions | Cookie Policy | Take Down Policy | Code of Conduct

From 449b9f3966e801c219847da0844b7534976504b0 Mon Sep 17 00:00:00 2001 From: Bibiana Cristofol Amat Date: Tue, 10 Feb 2026 09:44:36 +0000 Subject: [PATCH 5/5] source: includes: footer: fix new company info --- source/_includes/_footer.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/_includes/_footer.html b/source/_includes/_footer.html index 47b054a..587560a 100644 --- a/source/_includes/_footer.html +++ b/source/_includes/_footer.html @@ -54,7 +54,11 @@

360Giving

-

360Giving: Company 09668396 Charity 1116201

+

+ 360 Giving is a trading name of Funders Together. +
Funders Together is a charitable company registered in England and Wales, Company number: 5596299 and Charity number: 1116201. + Registered address: 4 Chiswell Street, London EC1Y 4UP. +

Privacy Notice | Terms & Conditions | Cookie Policy | Take Down Policy | Code of Conduct