Skip to content

Commit 2d2b362

Browse files
author
Scott Weber
authored
Merge pull request 18F#339 from 18F/sw-bundle-update
Updating bundle to fix nokogiri secuirty vulnerability
2 parents 53a32ac + d81bbb3 commit 2d2b362

File tree

2 files changed

+51
-37
lines changed

2 files changed

+51
-37
lines changed

Gemfile.lock

Lines changed: 50 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,42 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.7.1)
4+
activesupport (4.2.10)
55
i18n (~> 0.7)
6-
json (~> 1.7, >= 1.7.7)
76
minitest (~> 5.1)
87
thread_safe (~> 0.3, >= 0.3.4)
98
tzinfo (~> 1.1)
10-
addressable (2.5.1)
11-
public_suffix (~> 2.0, >= 2.0.2)
9+
addressable (2.5.2)
10+
public_suffix (>= 2.0.2, < 4.0)
1211
colorator (1.1.0)
12+
concurrent-ruby (1.0.5)
13+
em-websocket (0.5.1)
14+
eventmachine (>= 0.12.9)
15+
http_parser.rb (~> 0.6.0)
16+
eventmachine (1.2.5)
1317
ffi (1.9.18)
1418
forwardable-extended (2.6.0)
1519
gemoji (3.0.0)
1620
hash-joiner (0.0.7)
1721
safe_yaml
18-
html-pipeline (2.6.0)
22+
html-pipeline (2.7.1)
1923
activesupport (>= 2)
2024
nokogiri (>= 1.4)
21-
i18n (0.7.0)
22-
jekyll (3.4.3)
25+
http_parser.rb (0.6.0)
26+
i18n (0.9.1)
27+
concurrent-ruby (~> 1.0)
28+
jekyll (3.7.0)
2329
addressable (~> 2.4)
2430
colorator (~> 1.0)
31+
em-websocket (~> 0.5)
32+
i18n (~> 0.7)
2533
jekyll-sass-converter (~> 1.0)
26-
jekyll-watch (~> 1.1)
27-
kramdown (~> 1.3)
28-
liquid (~> 3.0)
34+
jekyll-watch (~> 2.0)
35+
kramdown (~> 1.14)
36+
liquid (~> 4.0)
2937
mercenary (~> 0.3.3)
3038
pathutil (~> 0.9)
31-
rouge (~> 1.7)
39+
rouge (>= 1.7, < 4)
3240
safe_yaml (~> 1.0)
3341
jekyll-last-modified-at (1.0.1)
3442
jekyll (~> 3.3)
@@ -37,41 +45,44 @@ GEM
3745
activesupport (~> 4.0)
3846
html-pipeline (~> 2.3)
3947
jekyll (~> 3.0)
40-
jekyll-sass-converter (1.5.0)
48+
jekyll-sass-converter (1.5.1)
4149
sass (~> 3.4)
42-
jekyll-watch (1.5.0)
43-
listen (~> 3.0, < 3.1)
44-
jemoji (0.8.0)
45-
activesupport (~> 4.0)
50+
jekyll-watch (2.0.0)
51+
listen (~> 3.0)
52+
jemoji (0.9.0)
53+
activesupport (~> 4.0, >= 4.2.9)
4654
gemoji (~> 3.0)
4755
html-pipeline (~> 2.2)
48-
jekyll (>= 3.0)
49-
json (1.8.3)
50-
kramdown (1.13.2)
51-
liquid (3.0.6)
52-
listen (3.0.8)
56+
jekyll (~> 3.0)
57+
kramdown (1.16.2)
58+
liquid (4.0.0)
59+
listen (3.1.5)
5360
rb-fsevent (~> 0.9, >= 0.9.4)
5461
rb-inotify (~> 0.9, >= 0.9.7)
62+
ruby_dep (~> 1.2)
5563
mercenary (0.3.6)
56-
mini_portile2 (2.1.0)
57-
minitest (5.9.0)
58-
nokogiri (1.6.8)
59-
mini_portile2 (~> 2.1.0)
60-
pkg-config (~> 1.1.7)
61-
pathutil (0.14.0)
64+
mini_portile2 (2.3.0)
65+
minitest (5.11.1)
66+
nokogiri (1.8.1)
67+
mini_portile2 (~> 2.3.0)
68+
pathutil (0.16.1)
6269
forwardable-extended (~> 2.6)
63-
pkg-config (1.1.7)
6470
posix-spawn (0.3.13)
65-
public_suffix (2.0.5)
66-
rb-fsevent (0.9.8)
67-
rb-inotify (0.9.8)
68-
ffi (>= 0.5.0)
71+
public_suffix (3.0.1)
72+
rb-fsevent (0.10.2)
73+
rb-inotify (0.9.10)
74+
ffi (>= 0.5.0, < 2)
6975
redcarpet (3.4.0)
70-
rouge (1.11.1)
76+
rouge (3.1.0)
77+
ruby_dep (1.5.0)
7178
safe_yaml (1.0.4)
72-
sass (3.4.23)
73-
thread_safe (0.3.5)
74-
tzinfo (1.2.2)
79+
sass (3.5.5)
80+
sass-listen (~> 4.0.0)
81+
sass-listen (4.0.0)
82+
rb-fsevent (~> 0.9, >= 0.9.4)
83+
rb-inotify (~> 0.9, >= 0.9.7)
84+
thread_safe (0.3.6)
85+
tzinfo (1.2.4)
7586
thread_safe (~> 0.1)
7687

7788
PLATFORMS
@@ -85,3 +96,6 @@ DEPENDENCIES
8596
jemoji
8697
redcarpet
8798
rouge
99+
100+
BUNDLED WITH
101+
1.15.4

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jekyll_get:
3636
- data: releases
3737
json: 'https://api.github.com/repos/18F/methods/releases'
3838

39-
gems:
39+
plugins:
4040
- jekyll-last-modified-at
4141
- jemoji
4242
- jekyll-mentions

0 commit comments

Comments
 (0)