Merge pull request #6283 from NHSDigital/dependabot/bundler/bundler-ea4d1962df

thomasleese · web-flow · commit baa894765c47 · 2026-03-12T18:06:33.000Z
Bump action_text-trix from 2.1.16 to 2.1.17 in the bundler group across 1 directory
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -76,6 +76,7 @@ Style/FrozenStringLiteralComment:
   Enabled: true
   EnforcedStyle: always_true
   Exclude:
+    - db/data_schema.rb
     - db/schema.rb
 
 Style/NumericLiterals:
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -25,7 +25,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    action_text-trix (2.1.16)
+    action_text-trix (2.1.17)
       railties
     actioncable (8.1.2)
       actionpack (= 8.1.2)
diff --git a/db/data_schema.rb b/db/data_schema.rb
@@ -1,3 +1 @@
-# frozen_string_literal: true
-
 DataMigrate::Data.define(version: 2026_03_05_165603)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1 @@`
`1`		`-# frozen_string_literal: true`
`2`		`-`
`3`	`1`	`DataMigrate::Data.define(version: 2026_03_05_165603)`