From f63c5c3410ff4eccca49f37e02824b602307322e Mon Sep 17 00:00:00 2001
From: Brian Shand <Brian.Shand@nhs.net>
Date: Fri, 24 Jan 2025 10:32:41 +0000
Subject: [PATCH 1/3] Fix concurrent-ruby version to 1.3.4 for older Rails
 versions

---
 gemfiles/Gemfile.rails61 | 3 +++
 gemfiles/Gemfile.rails70 | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/gemfiles/Gemfile.rails61 b/gemfiles/Gemfile.rails61
index ff27abf..8fdb206 100644
--- a/gemfiles/Gemfile.rails61
+++ b/gemfiles/Gemfile.rails61
@@ -7,3 +7,6 @@ gem 'rails', '~> 6.1.0'
 # Rails 6.1 does not support sqlite3 2.x; it specifies gem "sqlite3", "~> 1.4"
 # in lib/active_record/connection_adapters/sqlite3_adapter.rb
 gem 'sqlite3', '~> 1.7'
+
+# Latest concurrent-ruby breaks Rails < 7.1. See https://github.com/rails/rails/issues/54260
+gem 'concurrent-ruby', '1.3.4'
diff --git a/gemfiles/Gemfile.rails70 b/gemfiles/Gemfile.rails70
index 2515640..a35c58c 100644
--- a/gemfiles/Gemfile.rails70
+++ b/gemfiles/Gemfile.rails70
@@ -7,3 +7,6 @@ gem 'rails',  '~> 7.0.0'
 # Rails 7.0 does not support sqlite3 2.x; it specifies gem "sqlite3", "~> 1.4"
 # in lib/active_record/connection_adapters/sqlite3_adapter.rb
 gem 'sqlite3', '~> 1.7'
+
+# Latest concurrent-ruby breaks Rails < 7.1. See https://github.com/rails/rails/issues/54260
+gem 'concurrent-ruby', '1.3.4'

From d266b898194afa13ce4cedaabad01a2445d68c23 Mon Sep 17 00:00:00 2001
From: Brian Shand <Brian.Shand@nhs.net>
Date: Fri, 24 Jan 2025 10:51:47 +0000
Subject: [PATCH 2/3] Gem packaging tweaks

---
 ndr_ui.gemspec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ndr_ui.gemspec b/ndr_ui.gemspec
index 1935832..e36c3ba 100644
--- a/ndr_ui.gemspec
+++ b/ndr_ui.gemspec
@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/NHSDigital/ndr_ui'
   spec.license       = 'MIT'
 
-  spec.files = Dir['{app,config,lib,vendor}/**/*', 'LICENSE.txt', 'Rakefile',
-                   'README.md'] - ['.travis.yml']
+  spec.files = Dir['{app,config,lib,vendor}/**/*', 'CHANGELOG.md', 'CODE_OF_CONDUCT.md',
+                   'LICENSE.txt', 'Rakefile', 'README.md'] - ['.travis.yml']
 
   spec.required_ruby_version = '>= 3.0.0'
 

From 8128a128d55ee4a777d8f5829c2048a424a6725e Mon Sep 17 00:00:00 2001
From: Brian Shand <Brian.Shand@nhs.net>
Date: Fri, 24 Jan 2025 10:46:01 +0000
Subject: [PATCH 3/3] tag v4.1.2

---
 CHANGELOG.md          | 4 ++++
 lib/ndr_ui/version.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22c7f20..4b56276 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,8 @@
 ## [Unreleased]
+* no unreleased changes *
+
+## 4.1.2 / 2025-01-24
+### Fixed
 * Bump bootstrap-datepicker to 1.7.1
 
 ## 4.1.1 / 2024-11-20
diff --git a/lib/ndr_ui/version.rb b/lib/ndr_ui/version.rb
index 9883f08..2635387 100644
--- a/lib/ndr_ui/version.rb
+++ b/lib/ndr_ui/version.rb
@@ -2,5 +2,5 @@
 
 # This stores the current version of the NdrUi gem. Use semantic versioning http://semver.org
 module NdrUi
-  VERSION = '4.1.1'
+  VERSION = '4.1.2'
 end