Skip to content

Commit eb4b852

Browse files
committed
Merge branch 'update-dependencies'
2 parents 06d39e3 + bbf19d9 commit eb4b852

File tree

2 files changed

+34
-28
lines changed

2 files changed

+34
-28
lines changed

Gemfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ source 'https://rubygems.org'
33
gem 'rake'
44
gem 'neat'
55
gem 'kramdown'
6-
gem 'jekyll'
6+
# jekyll depends on kramdown-parser-gfm, but fails to declare it
7+
gem 'kramdown-parser-gfm'
8+
# Pin to the version used on GitHub Pages
9+
gem 'jekyll', 3.9
710
gem 'jekyll-redirect-from'
811

912
# Avoid polling on windows

Gemfile.lock

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,63 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.5.2)
5-
public_suffix (>= 2.0.2, < 4.0)
4+
addressable (2.7.0)
5+
public_suffix (>= 2.0.2, < 5.0)
66
colorator (1.1.0)
7-
concurrent-ruby (1.1.3)
8-
em-websocket (0.5.1)
7+
concurrent-ruby (1.1.8)
8+
em-websocket (0.5.2)
99
eventmachine (>= 0.12.9)
1010
http_parser.rb (~> 0.6.0)
1111
eventmachine (1.2.7)
1212
eventmachine (1.2.7-x64-mingw32)
13-
ffi (1.9.25)
14-
ffi (1.9.25-x64-mingw32)
13+
ffi (1.15.0)
14+
ffi (1.15.0-x64-mingw32)
1515
forwardable-extended (2.6.0)
1616
http_parser.rb (0.6.0)
1717
i18n (0.9.5)
1818
concurrent-ruby (~> 1.0)
19-
jekyll (3.8.5)
19+
jekyll (3.9.0)
2020
addressable (~> 2.4)
2121
colorator (~> 1.0)
2222
em-websocket (~> 0.5)
2323
i18n (~> 0.7)
2424
jekyll-sass-converter (~> 1.0)
2525
jekyll-watch (~> 2.0)
26-
kramdown (~> 1.14)
26+
kramdown (>= 1.17, < 3)
2727
liquid (~> 4.0)
2828
mercenary (~> 0.3.3)
2929
pathutil (~> 0.9)
3030
rouge (>= 1.7, < 4)
3131
safe_yaml (~> 1.0)
32-
jekyll-redirect-from (0.14.0)
33-
jekyll (~> 3.3)
32+
jekyll-redirect-from (0.16.0)
33+
jekyll (>= 3.3, < 5.0)
3434
jekyll-sass-converter (1.5.2)
3535
sass (~> 3.4)
36-
jekyll-watch (2.1.2)
36+
jekyll-watch (2.2.1)
3737
listen (~> 3.0)
38-
kramdown (1.17.0)
39-
liquid (4.0.1)
40-
listen (3.1.5)
41-
rb-fsevent (~> 0.9, >= 0.9.4)
42-
rb-inotify (~> 0.9, >= 0.9.7)
43-
ruby_dep (~> 1.2)
38+
kramdown (2.3.1)
39+
rexml
40+
kramdown-parser-gfm (1.1.0)
41+
kramdown (~> 2.0)
42+
liquid (4.0.3)
43+
listen (3.5.1)
44+
rb-fsevent (~> 0.10, >= 0.10.3)
45+
rb-inotify (~> 0.9, >= 0.9.10)
4446
mercenary (0.3.6)
4547
neat (3.0.0)
4648
sass (~> 3.4)
4749
thor (~> 0.19)
4850
pathutil (0.16.2)
4951
forwardable-extended (~> 2.6)
50-
public_suffix (3.0.3)
52+
public_suffix (4.0.6)
5153
rake (12.3.1)
52-
rb-fsevent (0.10.3)
53-
rb-inotify (0.9.10)
54-
ffi (>= 0.5.0, < 2)
55-
rouge (3.3.0)
56-
ruby_dep (1.5.0)
57-
safe_yaml (1.0.4)
58-
sass (3.7.2)
54+
rb-fsevent (0.10.4)
55+
rb-inotify (0.10.1)
56+
ffi (~> 1.0)
57+
rexml (3.2.4)
58+
rouge (3.26.0)
59+
safe_yaml (1.0.5)
60+
sass (3.7.4)
5961
sass-listen (~> 4.0.0)
6062
sass-listen (4.0.0)
6163
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -68,12 +70,13 @@ PLATFORMS
6870
x64-mingw32
6971

7072
DEPENDENCIES
71-
jekyll
73+
jekyll (= 3.9)
7274
jekyll-redirect-from
7375
kramdown
76+
kramdown-parser-gfm
7477
neat
7578
rake
7679
wdm (>= 0.1.0)
7780

7881
BUNDLED WITH
79-
1.12.4
82+
1.17.3

0 commit comments

Comments
 (0)