Skip to content

Commit e76e876

Browse files
sshkhrsshkhr
authored
Merge branch 'master' into patch-9
2 parents 7d37a98 + afd8fff commit e76e876

3 files changed

Lines changed: 181 additions & 221 deletions

File tree

‎site/Gemfile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
source 'https://rubygems.org'
22

3-
# Use Jekyll 3.9.x (same major/minor version GitHub Pages uses,
4-
# but without disabling custom plugins)
5-
gem "jekyll", "~> 3.9.2"
3+
# Jekyll 3.9.3+ shims tainted?/untaint for Ruby 3.2+ compatibility
4+
gem "jekyll", "~> 3.9.5"
65

76
# For local testing of links, images, etc.
87
gem 'html-proofer'
98

109
# So you can run `jekyll serve` without issues on Ruby 3.x
1110
gem "webrick", "~> 1.7"
1211

12+
# Ruby 3.4+ removed these from the standard library;
13+
# Jekyll 3.9.x needs them but doesn't declare them as dependencies
14+
gem 'csv'
15+
gem 'base64'
16+
gem 'bigdecimal'
17+
1318
group :jekyll_plugins do
14-
# DataPage Generator to create pages from .yml data
1519
gem "jekyll-datapage-generator"
16-
17-
# Additional Jekyll plugins you were using:
1820
gem 'jekyll-seo-tag'
1921
gem 'jekyll-maps'
2022
gem 'jekyll-sitemap'
2123
gem 'jekyll-feed'
22-
2324
gem 'kramdown-parser-gfm'
24-
end
25+
end

‎site/Gemfile.lock‎

Lines changed: 27 additions & 213 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,21 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.0.4.8)
5-
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)
104
addressable (2.8.0)
115
public_suffix (>= 2.0.2, < 5.0)
12-
coffee-script (2.4.1)
13-
coffee-script-source
14-
execjs
15-
coffee-script-source (1.11.1)
6+
base64 (0.3.0)
7+
bigdecimal (4.0.1)
168
colorator (1.1.0)
17-
commonmarker (0.23.4)
18-
concurrent-ruby (1.1.10)
19-
dnsruby (1.61.9)
20-
simpleidn (~> 0.1)
9+
concurrent-ruby (1.3.6)
10+
csv (3.3.5)
2111
em-websocket (0.5.3)
2212
eventmachine (>= 0.12.9)
2313
http_parser.rb (~> 0)
2414
ethon (0.15.0)
2515
ffi (>= 1.15.0)
2616
eventmachine (1.2.7)
27-
execjs (2.8.1)
28-
faraday (1.10.0)
29-
faraday-em_http (~> 1.0)
30-
faraday-em_synchrony (~> 1.0)
31-
faraday-excon (~> 1.1)
32-
faraday-httpclient (~> 1.0)
33-
faraday-multipart (~> 1.0)
34-
faraday-net_http (~> 1.0)
35-
faraday-net_http_persistent (~> 1.0)
36-
faraday-patron (~> 1.0)
37-
faraday-rack (~> 1.0)
38-
faraday-retry (~> 1.0)
39-
ruby2_keywords (>= 0.0.4)
40-
faraday-em_http (1.0.0)
41-
faraday-em_synchrony (1.0.0)
42-
faraday-excon (1.1.0)
43-
faraday-httpclient (1.0.1)
44-
faraday-multipart (1.0.3)
45-
multipart-post (>= 1.2, < 3)
46-
faraday-net_http (1.0.1)
47-
faraday-net_http_persistent (1.2.0)
48-
faraday-patron (1.0.0)
49-
faraday-rack (1.0.0)
50-
faraday-retry (1.0.3)
5117
ffi (1.15.5)
5218
forwardable-extended (2.6.0)
53-
gemoji (3.0.1)
54-
github-pages (226)
55-
github-pages-health-check (= 1.17.9)
56-
jekyll (= 3.9.2)
57-
jekyll-avatar (= 0.7.0)
58-
jekyll-coffeescript (= 1.1.1)
59-
jekyll-commonmark-ghpages (= 0.2.0)
60-
jekyll-default-layout (= 0.1.4)
61-
jekyll-feed (= 0.15.1)
62-
jekyll-gist (= 1.5.0)
63-
jekyll-github-metadata (= 2.13.0)
64-
jekyll-include-cache (= 0.2.1)
65-
jekyll-mentions (= 1.6.0)
66-
jekyll-optional-front-matter (= 0.3.2)
67-
jekyll-paginate (= 1.1.0)
68-
jekyll-readme-index (= 0.3.0)
69-
jekyll-redirect-from (= 0.16.0)
70-
jekyll-relative-links (= 0.6.1)
71-
jekyll-remote-theme (= 0.4.3)
72-
jekyll-sass-converter (= 1.5.2)
73-
jekyll-seo-tag (= 2.8.0)
74-
jekyll-sitemap (= 1.4.0)
75-
jekyll-swiss (= 1.0.0)
76-
jekyll-theme-architect (= 0.2.0)
77-
jekyll-theme-cayman (= 0.2.0)
78-
jekyll-theme-dinky (= 0.2.0)
79-
jekyll-theme-hacker (= 0.2.0)
80-
jekyll-theme-leap-day (= 0.2.0)
81-
jekyll-theme-merlot (= 0.2.0)
82-
jekyll-theme-midnight (= 0.2.0)
83-
jekyll-theme-minimal (= 0.2.0)
84-
jekyll-theme-modernist (= 0.2.0)
85-
jekyll-theme-primer (= 0.6.0)
86-
jekyll-theme-slate (= 0.2.0)
87-
jekyll-theme-tactile (= 0.2.0)
88-
jekyll-theme-time-machine (= 0.2.0)
89-
jekyll-titles-from-headings (= 0.5.3)
90-
jemoji (= 0.12.0)
91-
kramdown (= 2.3.2)
92-
kramdown-parser-gfm (= 1.1.0)
93-
liquid (= 4.0.3)
94-
mercenary (~> 0.3)
95-
minima (= 2.5.1)
96-
nokogiri (>= 1.13.4, < 2.0)
97-
rouge (= 3.26.0)
98-
terminal-table (~> 1.4)
99-
github-pages-health-check (1.17.9)
100-
addressable (~> 2.3)
101-
dnsruby (~> 1.60)
102-
octokit (~> 4.0)
103-
public_suffix (>= 3.0, < 5.0)
104-
typhoeus (~> 1.3)
105-
html-pipeline (2.14.1)
106-
activesupport (>= 2)
107-
nokogiri (>= 1.4)
10819
html-proofer (3.19.3)
10920
addressable (~> 2.3)
11021
mercenary (~> 0.3)
@@ -113,14 +24,14 @@ GEM
11324
rainbow (~> 3.0)
11425
typhoeus (~> 1.3)
11526
yell (~> 2.0)
116-
http_parser.rb (0.8.0)
117-
i18n (0.9.5)
27+
http_parser.rb (0.8.1)
28+
i18n (1.14.8)
11829
concurrent-ruby (~> 1.0)
119-
jekyll (3.9.2)
30+
jekyll (3.9.5)
12031
addressable (~> 2.4)
12132
colorator (~> 1.0)
12233
em-websocket (~> 0.5)
123-
i18n (~> 0.7)
34+
i18n (>= 0.7, < 2)
12435
jekyll-sass-converter (~> 1.0)
12536
jekyll-watch (~> 2.0)
12637
kramdown (>= 1.17, < 3)
@@ -129,168 +40,71 @@ GEM
12940
pathutil (~> 0.9)
13041
rouge (>= 1.7, < 4)
13142
safe_yaml (~> 1.0)
132-
jekyll-avatar (0.7.0)
133-
jekyll (>= 3.0, < 5.0)
134-
jekyll-coffeescript (1.1.1)
135-
coffee-script (~> 2.2)
136-
coffee-script-source (~> 1.11.1)
137-
jekyll-commonmark (1.4.0)
138-
commonmarker (~> 0.22)
139-
jekyll-commonmark-ghpages (0.2.0)
140-
commonmarker (~> 0.23.4)
141-
jekyll (~> 3.9.0)
142-
jekyll-commonmark (~> 1.4.0)
143-
rouge (>= 2.0, < 4.0)
144-
jekyll-default-layout (0.1.4)
145-
jekyll (~> 3.0)
43+
jekyll-datapage-generator (1.4.0)
14644
jekyll-feed (0.15.1)
14745
jekyll (>= 3.7, < 5.0)
148-
jekyll-gist (1.5.0)
149-
octokit (~> 4.2)
150-
jekyll-github-metadata (2.13.0)
151-
jekyll (>= 3.4, < 5.0)
152-
octokit (~> 4.0, != 4.4.0)
153-
jekyll-include-cache (0.2.1)
154-
jekyll (>= 3.7, < 5.0)
155-
jekyll-mentions (1.6.0)
156-
html-pipeline (~> 2.3)
157-
jekyll (>= 3.7, < 5.0)
158-
jekyll-optional-front-matter (0.3.2)
46+
jekyll-maps (2.4.0)
15947
jekyll (>= 3.0, < 5.0)
160-
jekyll-paginate (1.1.0)
161-
jekyll-readme-index (0.3.0)
162-
jekyll (>= 3.0, < 5.0)
163-
jekyll-redirect-from (0.16.0)
164-
jekyll (>= 3.3, < 5.0)
165-
jekyll-relative-links (0.6.1)
166-
jekyll (>= 3.3, < 5.0)
167-
jekyll-remote-theme (0.4.3)
168-
addressable (~> 2.0)
169-
jekyll (>= 3.5, < 5.0)
170-
jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
171-
rubyzip (>= 1.3.0, < 3.0)
17248
jekyll-sass-converter (1.5.2)
17349
sass (~> 3.4)
17450
jekyll-seo-tag (2.8.0)
17551
jekyll (>= 3.8, < 5.0)
17652
jekyll-sitemap (1.4.0)
17753
jekyll (>= 3.7, < 5.0)
178-
jekyll-swiss (1.0.0)
179-
jekyll-theme-architect (0.2.0)
180-
jekyll (> 3.5, < 5.0)
181-
jekyll-seo-tag (~> 2.0)
182-
jekyll-theme-cayman (0.2.0)
183-
jekyll (> 3.5, < 5.0)
184-
jekyll-seo-tag (~> 2.0)
185-
jekyll-theme-dinky (0.2.0)
186-
jekyll (> 3.5, < 5.0)
187-
jekyll-seo-tag (~> 2.0)
188-
jekyll-theme-hacker (0.2.0)
189-
jekyll (> 3.5, < 5.0)
190-
jekyll-seo-tag (~> 2.0)
191-
jekyll-theme-leap-day (0.2.0)
192-
jekyll (> 3.5, < 5.0)
193-
jekyll-seo-tag (~> 2.0)
194-
jekyll-theme-merlot (0.2.0)
195-
jekyll (> 3.5, < 5.0)
196-
jekyll-seo-tag (~> 2.0)
197-
jekyll-theme-midnight (0.2.0)
198-
jekyll (> 3.5, < 5.0)
199-
jekyll-seo-tag (~> 2.0)
200-
jekyll-theme-minimal (0.2.0)
201-
jekyll (> 3.5, < 5.0)
202-
jekyll-seo-tag (~> 2.0)
203-
jekyll-theme-modernist (0.2.0)
204-
jekyll (> 3.5, < 5.0)
205-
jekyll-seo-tag (~> 2.0)
206-
jekyll-theme-primer (0.6.0)
207-
jekyll (> 3.5, < 5.0)
208-
jekyll-github-metadata (~> 2.9)
209-
jekyll-seo-tag (~> 2.0)
210-
jekyll-theme-slate (0.2.0)
211-
jekyll (> 3.5, < 5.0)
212-
jekyll-seo-tag (~> 2.0)
213-
jekyll-theme-tactile (0.2.0)
214-
jekyll (> 3.5, < 5.0)
215-
jekyll-seo-tag (~> 2.0)
216-
jekyll-theme-time-machine (0.2.0)
217-
jekyll (> 3.5, < 5.0)
218-
jekyll-seo-tag (~> 2.0)
219-
jekyll-titles-from-headings (0.5.3)
220-
jekyll (>= 3.3, < 5.0)
22154
jekyll-watch (2.2.1)
22255
listen (~> 3.0)
223-
jemoji (0.12.0)
224-
gemoji (~> 3.0)
225-
html-pipeline (~> 2.2)
226-
jekyll (>= 3.0, < 5.0)
22756
kramdown (2.3.2)
22857
rexml
22958
kramdown-parser-gfm (1.1.0)
23059
kramdown (~> 2.0)
231-
liquid (4.0.3)
232-
listen (3.7.1)
60+
liquid (4.0.4)
61+
listen (3.10.0)
62+
logger
23363
rb-fsevent (~> 0.10, >= 0.10.3)
23464
rb-inotify (~> 0.9, >= 0.9.10)
65+
logger (1.7.0)
23566
mercenary (0.3.6)
23667
mini_portile2 (2.8.0)
237-
minima (2.5.1)
238-
jekyll (>= 3.5, < 5.0)
239-
jekyll-feed (~> 0.9)
240-
jekyll-seo-tag (~> 2.1)
241-
minitest (5.15.0)
242-
multipart-post (2.1.1)
24368
nokogiri (1.13.5)
24469
mini_portile2 (~> 2.8.0)
24570
racc (~> 1.4)
246-
octokit (4.22.0)
247-
faraday (>= 0.9)
248-
sawyer (~> 0.8.0, >= 0.5.3)
24971
parallel (1.22.1)
25072
pathutil (0.16.2)
25173
forwardable-extended (~> 2.6)
25274
public_suffix (4.0.7)
25375
racc (1.6.0)
25476
rainbow (3.1.1)
255-
rb-fsevent (0.11.1)
256-
rb-inotify (0.10.1)
77+
rb-fsevent (0.11.2)
78+
rb-inotify (0.11.1)
25779
ffi (~> 1.0)
25880
rexml (3.2.5)
259-
rouge (3.26.0)
260-
ruby2_keywords (0.0.5)
261-
rubyzip (2.3.2)
81+
rouge (3.30.0)
26282
safe_yaml (1.0.5)
26383
sass (3.7.4)
26484
sass-listen (~> 4.0.0)
26585
sass-listen (4.0.0)
26686
rb-fsevent (~> 0.9, >= 0.9.4)
26787
rb-inotify (~> 0.9, >= 0.9.7)
268-
sawyer (0.8.2)
269-
addressable (>= 2.3.5)
270-
faraday (> 0.8, < 2.0)
271-
simpleidn (0.2.1)
272-
unf (~> 0.1.4)
273-
terminal-table (1.8.0)
274-
unicode-display_width (~> 1.1, >= 1.1.1)
275-
thread_safe (0.3.6)
27688
typhoeus (1.4.0)
27789
ethon (>= 0.9.0)
278-
tzinfo (1.2.9)
279-
thread_safe (~> 0.1)
280-
unf (0.1.4)
281-
unf_ext
282-
unf_ext (0.0.8.1)
283-
unicode-display_width (1.8.0)
28490
webrick (1.7.0)
28591
yell (2.2.2)
286-
zeitwerk (2.5.4)
28792

28893
PLATFORMS
28994
ruby
29095

29196
DEPENDENCIES
292-
github-pages
97+
base64
98+
bigdecimal
99+
csv
293100
html-proofer
101+
jekyll (~> 3.9.5)
102+
jekyll-datapage-generator
103+
jekyll-feed
104+
jekyll-maps
105+
jekyll-seo-tag
106+
jekyll-sitemap
107+
kramdown-parser-gfm
294108
webrick (~> 1.7)
295109

296110
BUNDLED WITH

0 commit comments

Comments
 (0)