Skip to content

Commit 4d10f60

Browse files
committed
Jekyll 3.9.0 upgrade, also kramdown upgrade
this is comparable to scala/docs.scala-lang#1756. the motivation is the same: we got a security alert about kramdown. but it went a bit differently in this repo. if I did `bundle update jekyll` that went all the way to some 4.x version. I don't know why. but it seems safer to do a smaller upgrade first. `bundle update --minor jekyll` got us to 3.9.0, but then kramdown didn't get updated, so I followed it with `bundle update kramdown` (after adding `kramdown-parser-gfm` to `Gemfile`, as in the other PR) since I didn't do a full `bundle update`, I didn't need to revert any version bump of jekyll-redirect-from so.... it's not great that this doesn't bring the two repos exactly in sync, but oh well. I'm trying to resolve the security issue without putting excess effort into it. I wouldn't oppose followup PR(s) that reduce the deltas between the repos.
1 parent b6c24fb commit 4d10f60

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ gem 'rack-jekyll'
66
gem 'rake'
77
gem 'jekyll-redirect-from'
88
gem 'html-proofer'
9+
gem 'kramdown-parser-gfm'
910

1011
# group :jekyll_plugins do
1112
# gem 'hawkins'

Gemfile.lock

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ GEM
1010
public_suffix (>= 2.0.2, < 5.0)
1111
colorator (1.1.0)
1212
colorize (0.8.1)
13-
concurrent-ruby (1.1.6)
13+
concurrent-ruby (1.1.7)
1414
em-websocket (0.5.1)
1515
eventmachine (>= 0.12.9)
1616
http_parser.rb (~> 0.6.0)
@@ -31,14 +31,14 @@ GEM
3131
http_parser.rb (0.6.0)
3232
i18n (0.9.5)
3333
concurrent-ruby (~> 1.0)
34-
jekyll (3.8.7)
34+
jekyll (3.9.0)
3535
addressable (~> 2.4)
3636
colorator (~> 1.0)
3737
em-websocket (~> 0.5)
3838
i18n (~> 0.7)
3939
jekyll-sass-converter (~> 1.0)
4040
jekyll-watch (~> 2.0)
41-
kramdown (~> 1.14)
41+
kramdown (>= 1.17, < 3)
4242
liquid (~> 4.0)
4343
mercenary (~> 0.3.3)
4444
pathutil (~> 0.9)
@@ -50,7 +50,10 @@ GEM
5050
sass (~> 3.4)
5151
jekyll-watch (2.2.1)
5252
listen (~> 3.0)
53-
kramdown (1.17.0)
53+
kramdown (2.3.0)
54+
rexml
55+
kramdown-parser-gfm (1.1.0)
56+
kramdown (~> 2.0)
5457
liquid (4.0.3)
5558
listen (3.2.1)
5659
rb-fsevent (~> 0.10, >= 0.10.3)
@@ -73,7 +76,8 @@ GEM
7376
rb-fsevent (0.10.4)
7477
rb-inotify (0.10.1)
7578
ffi (~> 1.0)
76-
rouge (3.20.0)
79+
rexml (3.2.4)
80+
rouge (3.22.0)
7781
safe_yaml (1.0.5)
7882
sass (3.7.4)
7983
sass-listen (~> 4.0.0)
@@ -95,5 +99,9 @@ DEPENDENCIES
9599
jekyll
96100
jekyll-redirect-from
97101
kramdown
102+
kramdown-parser-gfm
98103
rack-jekyll
99104
rake
105+
106+
BUNDLED WITH
107+
2.1.4

0 commit comments

Comments
 (0)