From bd066e28386032d0f93020e79332eba93f3edd54 Mon Sep 17 00:00:00 2001 From: meyric Date: Fri, 22 Nov 2024 11:13:55 +0000 Subject: [PATCH 1/2] Update Ruby to 3.3.6 --- .ruby-version | 2 +- CHANGELOG.md | 4 ++++ Dockerfile | 2 +- Gemfile.lock | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.ruby-version b/.ruby-version index ef538c281..9c25013db 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.2 +3.3.6 diff --git a/CHANGELOG.md b/CHANGELOG.md index 69d0052cf..c6ed1a901 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,12 @@ [Full changelog][unreleased] +- Update Ruby to 3.3.6 + ## Release 150 - 2024-11-25 +[Full changelog][150] + - Separate out users into tabbed view of active and inactive ## Release 149 - 2024-11-21 diff --git a/Dockerfile b/Dockerfile index 6370101d8..8a5a62e03 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # ------------------------------------------------------------------------------ # base # ------------------------------------------------------------------------------ -FROM ruby:3.1.2 AS base +FROM ruby:3.3.6 AS base ARG RAILS_ENV ARG NODE_MAJOR diff --git a/Gemfile.lock b/Gemfile.lock index e3fac66e3..b57a6c626 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -613,7 +613,7 @@ DEPENDENCIES wicked RUBY VERSION - ruby 3.1.2p20 + ruby 3.3.6 BUNDLED WITH 2.4.22 From c7f0d84cf55e47c46bafb1a039cd1b29eeb028d4 Mon Sep 17 00:00:00 2001 From: Ben Shimmin Date: Tue, 26 Nov 2024 10:03:35 +0000 Subject: [PATCH 2/2] Release 151 --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6ed1a901..64728ef74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ [Full changelog][unreleased] +## Release 151 - 2024-11-26 + +[Full changelog][151] + - Update Ruby to 3.3.6 ## Release 150 - 2024-11-25 @@ -1703,7 +1707,8 @@ - Planned start and end dates are mandatory - Actual start and end dates must not be in the future -[unreleased]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-150...HEAD +[unreleased]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-151...HEAD +[151]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-150...release-151 [150]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-149...release-150 [149]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-148...release-149 [148]: https://github.com/UKGovernmentBEIS/beis-report-official-development-assistance/compare/release-147...release-148