Skip to content

Commit 6769567

Browse files
authored
Merge pull request #949 from coderdojo-japan/update-scrivito-gem
Update scrivito gem: 1.16.0 -> 1.17.0
2 parents 9b63469 + 2f09015 commit 6769567

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gem 'pg'
88
gem 'dumper'
99
gem 'bootsnap'
1010

11-
gem 'scrivito', '~> 1.16.0'
11+
gem 'scrivito', '~> 1.17'
1212
gem 'scrivito_section_widgets'
1313
gem 'scrivito_teaser_widget'
1414

Gemfile.lock

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -323,38 +323,36 @@ GEM
323323
tilt (>= 1.1, < 3)
324324
sassc (2.4.0)
325325
ffi (~> 1.9)
326-
scrivito (1.16.0)
327-
scrivito_content_browser (= 1.16.0)
328-
scrivito_editors (= 1.16.0)
329-
scrivito_sdk (= 1.16.0)
330-
scrivito_ui (= 1.16.0)
331-
scrivito_content_browser (1.16.0)
326+
scrivito (1.17.0)
327+
scrivito_content_browser (= 1.17.0)
328+
scrivito_editors (= 1.17.0)
329+
scrivito_sdk (= 1.17.0)
330+
scrivito_ui (= 1.17.0)
331+
scrivito_content_browser (1.17.0)
332332
railties
333-
scrivito_sdk (= 1.16.0)
334-
scrivito_editors (1.16.0)
333+
scrivito_sdk (= 1.17.0)
334+
scrivito_editors (1.17.0)
335335
jquery-ui-rails (>= 5.0.0, < 7.0.0)
336336
railties
337-
scrivito_content_browser (= 1.16.0)
338-
scrivito_sdk (= 1.16.0)
339-
scrivito_sdk (1.16.0)
337+
scrivito_content_browser (= 1.17.0)
338+
scrivito_sdk (= 1.17.0)
339+
scrivito_sdk (1.17.0)
340340
addressable (~> 2.3)
341341
connection_pool (~> 2.2)
342342
diff-lcs (~> 1.3)
343343
hyp_diff (~> 0.0.4)
344-
jbuilder (~> 2.6)
344+
jbuilder (~> 2.10)
345345
jquery-rails (~> 4.1)
346-
json (>= 1.8.6)
346+
json (>= 2.0.0)
347347
memoist (>= 0.12.0)
348-
multi_json (~> 1.9)
349348
multipart-post (~> 2.0)
350349
nokogiri (~> 1.7)
351350
rails (~> 5.2.0)
352-
rake (>= 0.9.2.2)
353351
scrivito_section_widgets (1.1.2)
354352
scrivito
355353
scrivito_teaser_widget (0.1.2)
356354
scrivito
357-
scrivito_ui (1.16.0)
355+
scrivito_ui (1.17.0)
358356
railties
359357
secure_headers (6.3.1)
360358
selenium-webdriver (3.142.7)
@@ -457,7 +455,7 @@ DEPENDENCIES
457455
rspec-retry
458456
ruby-mp3info
459457
sass-rails (>= 5)
460-
scrivito (~> 1.16.0)
458+
scrivito (~> 1.17)
461459
scrivito_section_widgets
462460
scrivito_teaser_widget
463461
secure_headers

0 commit comments

Comments
 (0)