Skip to content

Commit a1c1715

Browse files
authored
Merge branch 'main' into dependabot/bundler/nokogiri-1.19.1
2 parents 15ef73b + ffdf7ca commit a1c1715

2 files changed

Lines changed: 41 additions & 22 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source "https://rubygems.org"
22

33
gem "github-pages", group: :jekyll_plugins
4-
gem "faraday", "0.17.3"
4+
gem "faraday", "2.14.1"
55

66
# remediation CVE-2020-14001
77
gem "kramdown", ">= 2.3.0"

Gemfile.lock

Lines changed: 40 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,53 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.1.7.5)
5-
concurrent-ruby (~> 1.0, >= 1.0.2)
4+
activesupport (7.2.3.1)
5+
base64
6+
benchmark (>= 0.3)
7+
bigdecimal
8+
concurrent-ruby (~> 1.0, >= 1.3.1)
9+
connection_pool (>= 2.2.5)
10+
drb
611
i18n (>= 1.6, < 2)
7-
minitest (>= 5.1)
8-
tzinfo (~> 2.0)
9-
zeitwerk (~> 2.3)
10-
addressable (2.8.0)
11-
public_suffix (>= 2.0.2, < 5.0)
12+
logger (>= 1.4.2)
13+
minitest (>= 5.1, < 6)
14+
securerandom (>= 0.3)
15+
tzinfo (~> 2.0, >= 2.0.5)
16+
addressable (2.9.0)
17+
public_suffix (>= 2.0.2, < 8.0)
1218
algolia_html_extractor (2.6.4)
1319
json (~> 2.0)
1420
nokogiri (~> 1.10)
1521
algoliasearch (1.27.5)
1622
httpclient (~> 2.8, >= 2.8.3)
1723
json (>= 1.5.1)
24+
base64 (0.3.0)
25+
benchmark (0.5.0)
26+
bigdecimal (4.0.1)
1827
coffee-script (2.4.1)
1928
coffee-script-source
2029
execjs
2130
coffee-script-source (1.11.1)
2231
colorator (1.1.0)
2332
commonmarker (0.23.11)
24-
concurrent-ruby (1.3.5)
33+
concurrent-ruby (1.3.6)
34+
connection_pool (3.0.2)
2535
dnsruby (1.61.5)
2636
simpleidn (~> 0.1)
37+
drb (2.2.3)
2738
em-websocket (0.5.2)
2839
eventmachine (>= 0.12.9)
2940
http_parser.rb (~> 0.6.0)
3041
ethon (0.13.0)
3142
ffi (>= 1.15.0)
3243
eventmachine (1.2.7)
3344
execjs (2.7.0)
34-
faraday (0.17.3)
35-
multipart-post (>= 1.2, < 3)
45+
faraday (2.14.1)
46+
faraday-net_http (>= 2.0, < 3.5)
47+
json
48+
logger
49+
faraday-net_http (3.4.2)
50+
net-http (~> 0.5)
3651
ffi (1.15.0)
3752
filesize (0.2.0)
3853
forwardable-extended (2.6.0)
@@ -93,7 +108,7 @@ GEM
93108
nokogiri (>= 1.4)
94109
http_parser.rb (0.6.0)
95110
httpclient (2.8.3)
96-
i18n (1.14.7)
111+
i18n (1.14.8)
97112
concurrent-ruby (~> 1.0)
98113
jekyll (3.9.3)
99114
addressable (~> 2.4)
@@ -221,6 +236,7 @@ GEM
221236
listen (3.5.1)
222237
rb-fsevent (~> 0.10, >= 0.10.3)
223238
rb-inotify (~> 0.9, >= 0.9.10)
239+
logger (1.7.0)
224240
mercenary (0.3.6)
225241
mini_portile2 (2.8.9)
226242
minima (2.5.1)
@@ -234,23 +250,25 @@ GEM
234250
jekyll-include-cache (~> 0.1)
235251
jekyll-paginate (~> 1.1)
236252
jekyll-sitemap (~> 1.3)
237-
minitest (5.25.5)
253+
net-http (0.9.1)
254+
uri (>= 0.11.1)
255+
minitest (5.27.0)
238256
multipart-post (2.1.1)
239257
nokogiri (1.19.1)
240258
mini_portile2 (~> 2.8.2)
241259
racc (~> 1.4)
242-
octokit (4.20.0)
243-
faraday (>= 0.9)
244-
sawyer (~> 0.8.0, >= 0.5.3)
260+
octokit (4.25.1)
261+
faraday (>= 1, < 3)
262+
sawyer (~> 0.9)
245263
pathutil (0.16.2)
246264
forwardable-extended (~> 2.6)
247265
progressbar (1.11.0)
248-
public_suffix (4.0.6)
266+
public_suffix (4.0.7)
249267
racc (1.8.1)
250268
rb-fsevent (0.10.4)
251269
rb-inotify (0.10.1)
252270
ffi (~> 1.0)
253-
rexml (3.3.9)
271+
rexml (3.4.2)
254272
rouge (3.26.0)
255273
rubyzip (2.3.0)
256274
safe_yaml (1.0.5)
@@ -259,9 +277,10 @@ GEM
259277
sass-listen (4.0.0)
260278
rb-fsevent (~> 0.9, >= 0.9.4)
261279
rb-inotify (~> 0.9, >= 0.9.7)
262-
sawyer (0.8.2)
280+
sawyer (0.9.3)
263281
addressable (>= 2.3.5)
264-
faraday (> 0.8, < 2.0)
282+
faraday (>= 0.17.3, < 3)
283+
securerandom (0.4.1)
265284
simpleidn (0.2.1)
266285
unf (~> 0.1.4)
267286
terminal-table (1.8.0)
@@ -276,16 +295,16 @@ GEM
276295
unf_ext
277296
unf_ext (0.0.7.7)
278297
unicode-display_width (1.7.0)
298+
uri (1.1.1)
279299
verbal_expressions (0.1.5)
280300
webrick (1.8.2)
281-
zeitwerk (2.7.3)
282301

283302
PLATFORMS
284303
ruby
285304

286305
DEPENDENCIES
287306
activesupport (>= 6.0.3.1)
288-
faraday (= 0.17.3)
307+
faraday (= 2.14.1)
289308
github-pages
290309
jekyll-algolia
291310
jekyll-feed

0 commit comments

Comments
 (0)