Skip to content

Commit 7adf632

Browse files
authored
Merge branch 'master' into dependabot/bundler/rexml-3.3.9
2 parents bf67f55 + 99651fb commit 7adf632

File tree

2 files changed

+67
-64
lines changed

2 files changed

+67
-64
lines changed

Gemfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
source "https://rubygems.org"
2-
3-
gem "github-pages"
4-
5-
gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?
6-
7-
group :jekyll_plugins do
8-
gem "jekyll-remote-theme"
9-
gem "jekyll-include-cache"
10-
end
11-
gem "webrick", "~> 1.7"
12-
gem "nokogiri", ">= 1.12.5"
13-
gem "commonmarker", ">= 0.23.4"
1+
source "https://rubygems.org"
2+
3+
gem "github-pages"
4+
5+
gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?
6+
7+
group :jekyll_plugins do
8+
gem "jekyll-remote-theme"
9+
gem "jekyll-include-cache"
10+
end
11+
gem "webrick", "~> 1.8"
12+
gem "nokogiri", ">= 1.12.5"
13+
gem "commonmarker", ">= 0.23.4"

Gemfile.lock

Lines changed: 54 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.0.6.1)
4+
activesupport (6.1.7.5)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
6-
i18n (>= 0.7, < 2)
7-
minitest (~> 5.1)
8-
tzinfo (~> 1.1)
9-
zeitwerk (~> 2.2, >= 2.2.2)
6+
i18n (>= 1.6, < 2)
7+
minitest (>= 5.1)
8+
tzinfo (~> 2.0)
9+
zeitwerk (~> 2.3)
1010
addressable (2.8.0)
1111
public_suffix (>= 2.0.2, < 5.0)
1212
coffee-script (2.4.1)
1313
coffee-script-source
1414
execjs
15-
coffee-script-source (1.11.1)
15+
coffee-script-source (1.12.2)
1616
colorator (1.1.0)
1717
commonmarker (0.23.10)
18-
concurrent-ruby (1.2.0)
18+
concurrent-ruby (1.3.5)
19+
csv (3.3.5)
1920
dnsruby (1.61.9)
2021
simpleidn (~> 0.1)
2122
em-websocket (0.5.3)
@@ -53,16 +54,16 @@ GEM
5354
ffi (1.15.5-x64-mingw32)
5455
forwardable-extended (2.6.0)
5556
gemoji (3.0.1)
56-
github-pages (225)
57-
github-pages-health-check (= 1.17.9)
58-
jekyll (= 3.9.0)
59-
jekyll-avatar (= 0.7.0)
60-
jekyll-coffeescript (= 1.1.1)
61-
jekyll-commonmark-ghpages (= 0.2.0)
62-
jekyll-default-layout (= 0.1.4)
63-
jekyll-feed (= 0.15.1)
57+
github-pages (232)
58+
github-pages-health-check (= 1.18.2)
59+
jekyll (= 3.10.0)
60+
jekyll-avatar (= 0.8.0)
61+
jekyll-coffeescript (= 1.2.2)
62+
jekyll-commonmark-ghpages (= 0.5.1)
63+
jekyll-default-layout (= 0.1.5)
64+
jekyll-feed (= 0.17.0)
6465
jekyll-gist (= 1.5.0)
65-
jekyll-github-metadata (= 2.13.0)
66+
jekyll-github-metadata (= 2.16.1)
6667
jekyll-include-cache (= 0.2.1)
6768
jekyll-mentions (= 1.6.0)
6869
jekyll-optional-front-matter (= 0.3.2)
@@ -89,32 +90,34 @@ GEM
8990
jekyll-theme-tactile (= 0.2.0)
9091
jekyll-theme-time-machine (= 0.2.0)
9192
jekyll-titles-from-headings (= 0.5.3)
92-
jemoji (= 0.12.0)
93-
kramdown (= 2.3.1)
93+
jemoji (= 0.13.0)
94+
kramdown (= 2.4.0)
9495
kramdown-parser-gfm (= 1.1.0)
95-
liquid (= 4.0.3)
96+
liquid (= 4.0.4)
9697
mercenary (~> 0.3)
9798
minima (= 2.5.1)
98-
nokogiri (>= 1.12.5, < 2.0)
99-
rouge (= 3.26.0)
99+
nokogiri (>= 1.16.2, < 2.0)
100+
rouge (= 3.30.0)
100101
terminal-table (~> 1.4)
101-
github-pages-health-check (1.17.9)
102+
webrick (~> 1.8)
103+
github-pages-health-check (1.18.2)
102104
addressable (~> 2.3)
103105
dnsruby (~> 1.60)
104-
octokit (~> 4.0)
105-
public_suffix (>= 3.0, < 5.0)
106+
octokit (>= 4, < 8)
107+
public_suffix (>= 3.0, < 6.0)
106108
typhoeus (~> 1.3)
107109
html-pipeline (2.14.0)
108110
activesupport (>= 2)
109111
nokogiri (>= 1.4)
110112
http_parser.rb (0.8.0)
111-
i18n (0.9.5)
113+
i18n (1.14.7)
112114
concurrent-ruby (~> 1.0)
113-
jekyll (3.9.0)
115+
jekyll (3.10.0)
114116
addressable (~> 2.4)
115117
colorator (~> 1.0)
118+
csv (~> 3.0)
116119
em-websocket (~> 0.5)
117-
i18n (~> 0.7)
120+
i18n (>= 0.7, < 2)
118121
jekyll-sass-converter (~> 1.0)
119122
jekyll-watch (~> 2.0)
120123
kramdown (>= 1.17, < 3)
@@ -123,27 +126,28 @@ GEM
123126
pathutil (~> 0.9)
124127
rouge (>= 1.7, < 4)
125128
safe_yaml (~> 1.0)
126-
jekyll-avatar (0.7.0)
129+
webrick (>= 1.0)
130+
jekyll-avatar (0.8.0)
127131
jekyll (>= 3.0, < 5.0)
128-
jekyll-coffeescript (1.1.1)
132+
jekyll-coffeescript (1.2.2)
129133
coffee-script (~> 2.2)
130-
coffee-script-source (~> 1.11.1)
134+
coffee-script-source (~> 1.12)
131135
jekyll-commonmark (1.4.0)
132136
commonmarker (~> 0.22)
133-
jekyll-commonmark-ghpages (0.2.0)
134-
commonmarker (~> 0.23.4)
135-
jekyll (~> 3.9.0)
137+
jekyll-commonmark-ghpages (0.5.1)
138+
commonmarker (>= 0.23.7, < 1.1.0)
139+
jekyll (>= 3.9, < 4.0)
136140
jekyll-commonmark (~> 1.4.0)
137-
rouge (>= 2.0, < 4.0)
138-
jekyll-default-layout (0.1.4)
139-
jekyll (~> 3.0)
140-
jekyll-feed (0.15.1)
141+
rouge (>= 2.0, < 5.0)
142+
jekyll-default-layout (0.1.5)
143+
jekyll (>= 3.0, < 5.0)
144+
jekyll-feed (0.17.0)
141145
jekyll (>= 3.7, < 5.0)
142146
jekyll-gist (1.5.0)
143147
octokit (~> 4.2)
144-
jekyll-github-metadata (2.13.0)
148+
jekyll-github-metadata (2.16.1)
145149
jekyll (>= 3.4, < 5.0)
146-
octokit (~> 4.0, != 4.4.0)
150+
octokit (>= 4, < 7, != 4.4.0)
147151
jekyll-include-cache (0.2.1)
148152
jekyll (>= 3.7, < 5.0)
149153
jekyll-mentions (1.6.0)
@@ -214,15 +218,15 @@ GEM
214218
jekyll (>= 3.3, < 5.0)
215219
jekyll-watch (2.2.1)
216220
listen (~> 3.0)
217-
jemoji (0.12.0)
218-
gemoji (~> 3.0)
221+
jemoji (0.13.0)
222+
gemoji (>= 3, < 5)
219223
html-pipeline (~> 2.2)
220224
jekyll (>= 3.0, < 5.0)
221-
kramdown (2.3.1)
225+
kramdown (2.4.0)
222226
rexml
223227
kramdown-parser-gfm (1.1.0)
224228
kramdown (~> 2.0)
225-
liquid (4.0.3)
229+
liquid (4.0.4)
226230
listen (3.7.1)
227231
rb-fsevent (~> 0.10, >= 0.10.3)
228232
rb-inotify (~> 0.9, >= 0.9.10)
@@ -232,7 +236,7 @@ GEM
232236
jekyll (>= 3.5, < 5.0)
233237
jekyll-feed (~> 0.9)
234238
jekyll-seo-tag (~> 2.1)
235-
minitest (5.17.0)
239+
minitest (5.25.5)
236240
multipart-post (2.1.1)
237241
nokogiri (1.18.9)
238242
mini_portile2 (~> 2.8.2)
@@ -250,7 +254,7 @@ GEM
250254
rb-inotify (0.10.1)
251255
ffi (~> 1.0)
252256
rexml (3.3.9)
253-
rouge (3.26.0)
257+
rouge (3.30.0)
254258
ruby2_keywords (0.0.5)
255259
rubyzip (2.3.2)
256260
safe_yaml (1.0.5)
@@ -266,19 +270,18 @@ GEM
266270
unf (~> 0.1.4)
267271
terminal-table (1.8.0)
268272
unicode-display_width (~> 1.1, >= 1.1.1)
269-
thread_safe (0.3.6)
270273
typhoeus (1.4.0)
271274
ethon (>= 0.9.0)
272-
tzinfo (1.2.11)
273-
thread_safe (~> 0.1)
275+
tzinfo (2.0.6)
276+
concurrent-ruby (~> 1.0)
274277
unf (0.1.4)
275278
unf_ext
276279
unf_ext (0.0.8)
277280
unf_ext (0.0.8-x64-mingw32)
278281
unicode-display_width (1.8.0)
279282
wdm (0.1.1)
280-
webrick (1.7.0)
281-
zeitwerk (2.6.6)
283+
webrick (1.8.2)
284+
zeitwerk (2.7.3)
282285

283286
PLATFORMS
284287
x64-mingw32
@@ -291,7 +294,7 @@ DEPENDENCIES
291294
jekyll-remote-theme
292295
nokogiri (>= 1.12.5)
293296
wdm (~> 0.1.1)
294-
webrick (~> 1.7)
297+
webrick (~> 1.8)
295298

296299
BUNDLED WITH
297300
2.2.19

0 commit comments

Comments
 (0)