Skip to content

Commit 2d2d012

Browse files
committed
Bump to Govspeak 6.3
A variety of fixes have been done to hopefully allow for Whitehall to upgrade to this without problems 🤞 see alphagov/govspeak#159 and alphagov/govspeak#164 for details.
1 parent f7b7de5 commit 2d2d012

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

Gemfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ end
7575
if ENV['GOVSPEAK_DEV']
7676
gem 'govspeak', path: '../govspeak'
7777
else
78-
# 5.5.0 only because sanitize 4.6.4 is stricter on govspeak, which makes attachments invalid
79-
# See https://trello.com/c/90AjvFzy/77-whitehall-isnt-able-to-use-latest-govspeak-version
80-
gem 'govspeak', '~> 5.5.0'
78+
gem 'govspeak', '~> 6'
8179
end
8280

8381
if ENV['FRONTEND_TOOLKIT_DEV']

Gemfile.lock

+13-13
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ GEM
9999
coffee-script-source
100100
execjs
101101
coffee-script-source (1.12.2)
102-
commander (4.4.7)
103-
highline (~> 2.0.0)
104102
concurrent-ruby (1.1.5)
105103
connection_pool (2.2.2)
106104
crack (0.4.3)
@@ -173,16 +171,17 @@ GEM
173171
activemodel (>= 4.2, < 6.1)
174172
activerecord (>= 4.2, < 6.1)
175173
request_store (~> 1.0)
176-
govspeak (5.5.0)
177-
actionview (>= 4.1, < 6)
174+
govspeak (6.3.0)
175+
actionview (~> 5.0)
178176
addressable (>= 2.3.8, < 3)
179-
commander (~> 4.4)
177+
govuk_publishing_components (>= 16.16)
180178
htmlentities (~> 4)
181179
i18n (~> 0.7)
182180
kramdown (~> 1.15.0)
183-
money (~> 6.7)
184181
nokogiri (~> 1.5)
185-
sanitize (~> 2.1.0)
182+
nokogumbo (~> 2)
183+
rinku (~> 2.0)
184+
sanitize (~> 5)
186185
govuk-content-schema-test-helpers (1.6.1)
187186
json-schema (~> 2.8.0)
188187
govuk-lint (3.11.2)
@@ -232,7 +231,6 @@ GEM
232231
hashdiff (0.4.0)
233232
hashery (2.1.2)
234233
hashie (3.6.0)
235-
highline (2.0.2)
236234
htmlentities (4.3.4)
237235
http-cookie (1.0.3)
238236
domain_name (~> 0.5)
@@ -308,8 +306,6 @@ GEM
308306
redis
309307
mocha (1.9.0)
310308
metaclass (~> 0.0.1)
311-
money (6.13.3)
312-
i18n (>= 0.6.4, <= 2)
313309
msgpack (1.2.10)
314310
multi_json (1.13.1)
315311
multi_test (0.1.2)
@@ -324,6 +320,8 @@ GEM
324320
nio4r (2.4.0)
325321
nokogiri (1.10.3)
326322
mini_portile2 (~> 2.4.0)
323+
nokogumbo (2.0.1)
324+
nokogiri (~> 1.8, >= 1.8.4)
327325
ntlm-http (0.1.1)
328326
null_logger (0.0.1)
329327
oauth2 (1.4.1)
@@ -446,8 +444,10 @@ GEM
446444
rufus-scheduler (3.5.0)
447445
fugit (~> 1.1, >= 1.1.1)
448446
safe_yaml (1.0.5)
449-
sanitize (2.1.1)
450-
nokogiri (>= 1.4.4)
447+
sanitize (5.0.0)
448+
crass (~> 1.0.2)
449+
nokogiri (>= 1.8.0)
450+
nokogumbo (~> 2.0)
451451
sass (3.7.4)
452452
sass-listen (~> 4.0.0)
453453
sass-listen (4.0.0)
@@ -590,7 +590,7 @@ DEPENDENCIES
590590
gds-api-adapters
591591
gds-sso (~> 14.1)
592592
globalize (~> 5)
593-
govspeak (~> 5.5.0)
593+
govspeak (~> 6)
594594
govuk-content-schema-test-helpers
595595
govuk-lint (~> 3)
596596
govuk_ab_testing (~> 2.4x)

0 commit comments

Comments
 (0)