Skip to content

Commit 0364863

Browse files
committed
Merge remote-tracking branch 'origin/upstream'
# Conflicts: # CUSTOMIZE.md # INSTALL.md # README.md # _config.yml # _layouts/bib.liquid
2 parents 5e9ebdc + f8c558b commit 0364863

File tree

5 files changed

+32
-326
lines changed

5 files changed

+32
-326
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ gem 'jekyll'
44

55
# Core plugins that directly affect site building
66
group :jekyll_plugins do
7+
gem 'jekyll-3rd-party-libraries'
78
gem 'jekyll-archives-v2'
9+
gem 'jekyll-cache-bust'
810
gem 'jekyll-email-protect'
911
gem 'jekyll-feed'
1012
gem 'jekyll-get-json'

Gemfile.lock

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GIT
99
GEM
1010
remote: https://rubygems.org/
1111
specs:
12-
activesupport (8.1.1)
12+
activesupport (8.1.2)
1313
base64
1414
bigdecimal
1515
concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -86,25 +86,25 @@ GEM
8686
forwardable (1.4.0)
8787
forwardable-extended (2.6.0)
8888
gemoji (4.1.0)
89-
google-protobuf (4.33.2)
89+
google-protobuf (4.33.4)
9090
bigdecimal
9191
rake (>= 13)
92-
google-protobuf (4.33.2-aarch64-linux-gnu)
92+
google-protobuf (4.33.4-aarch64-linux-gnu)
9393
bigdecimal
9494
rake (>= 13)
95-
google-protobuf (4.33.2-aarch64-linux-musl)
95+
google-protobuf (4.33.4-aarch64-linux-musl)
9696
bigdecimal
9797
rake (>= 13)
98-
google-protobuf (4.33.2-arm64-darwin)
98+
google-protobuf (4.33.4-arm64-darwin)
9999
bigdecimal
100100
rake (>= 13)
101-
google-protobuf (4.33.2-x86_64-darwin)
101+
google-protobuf (4.33.4-x86_64-darwin)
102102
bigdecimal
103103
rake (>= 13)
104-
google-protobuf (4.33.2-x86_64-linux-gnu)
104+
google-protobuf (4.33.4-x86_64-linux-gnu)
105105
bigdecimal
106106
rake (>= 13)
107-
google-protobuf (4.33.2-x86_64-linux-musl)
107+
google-protobuf (4.33.4-x86_64-linux-musl)
108108
bigdecimal
109109
rake (>= 13)
110110
html-pipeline (2.14.3)
@@ -118,6 +118,10 @@ GEM
118118
multi_xml (>= 0.5.2)
119119
i18n (1.14.8)
120120
concurrent-ruby (~> 1.0)
121+
jekyll-3rd-party-libraries (0.0.1)
122+
css_parser (>= 1.6, < 2.0)
123+
jekyll (>= 3.6, < 5.0)
124+
nokogiri (>= 1.8, < 2.0)
121125
jekyll (4.4.1)
122126
addressable (~> 2.4)
123127
base64 (~> 0.2)
@@ -140,6 +144,8 @@ GEM
140144
jekyll-archives-v2 (0.0.6)
141145
activesupport
142146
jekyll (>= 3.6, < 5.0)
147+
jekyll-cache-bust (0.0.1)
148+
jekyll (>= 3.6, < 5.0)
143149
jekyll-email-protect (1.1.0)
144150
jekyll-feed (0.17.0)
145151
jekyll (>= 3.7, < 5.0)
@@ -162,7 +168,7 @@ GEM
162168
jekyll-regex-replace (1.1.0)
163169
jekyll-sass-converter (3.1.0)
164170
sass-embedded (~> 1.75)
165-
jekyll-scholar (7.2.3)
171+
jekyll-scholar (7.3.0)
166172
bibtex-ruby (~> 6.0)
167173
citeproc-ruby (>= 2.1.6)
168174
csl-styles (~> 2.0)
@@ -188,7 +194,7 @@ GEM
188194
rexml (>= 3.3.9)
189195
kramdown-parser-gfm (1.1.0)
190196
kramdown (~> 2.0)
191-
latex-decode (0.4.0)
197+
latex-decode (0.4.2)
192198
liquid (4.0.4)
193199
listen (3.9.0)
194200
rb-fsevent (~> 0.10, >= 0.10.3)
@@ -202,7 +208,7 @@ GEM
202208
mini_mime (1.1.5)
203209
minitest (6.0.1)
204210
prism (~> 1.5)
205-
multi_xml (0.8.0)
211+
multi_xml (0.8.1)
206212
bigdecimal (>= 3.1, < 5)
207213
namae (1.2.0)
208214
racc (~> 1.7)
@@ -230,8 +236,8 @@ GEM
230236
ostruct (0.6.3)
231237
pathutil (0.16.2)
232238
forwardable-extended (~> 2.6)
233-
prism (1.7.0)
234-
public_suffix (7.0.0)
239+
prism (1.8.0)
240+
public_suffix (7.0.2)
235241
racc (1.8.1)
236242
rake (13.3.1)
237243
rb-fsevent (0.11.2)
@@ -240,21 +246,21 @@ GEM
240246
rexml (3.4.4)
241247
rouge (4.7.0)
242248
safe_yaml (1.0.5)
243-
sass-embedded (1.97.1-aarch64-linux-gnu)
249+
sass-embedded (1.97.2-aarch64-linux-gnu)
244250
google-protobuf (~> 4.31)
245-
sass-embedded (1.97.1-aarch64-linux-musl)
251+
sass-embedded (1.97.2-aarch64-linux-musl)
246252
google-protobuf (~> 4.31)
247-
sass-embedded (1.97.1-arm-linux-gnueabihf)
253+
sass-embedded (1.97.2-arm-linux-gnueabihf)
248254
google-protobuf (~> 4.31)
249-
sass-embedded (1.97.1-arm-linux-musleabihf)
255+
sass-embedded (1.97.2-arm-linux-musleabihf)
250256
google-protobuf (~> 4.31)
251-
sass-embedded (1.97.1-arm64-darwin)
257+
sass-embedded (1.97.2-arm64-darwin)
252258
google-protobuf (~> 4.31)
253-
sass-embedded (1.97.1-x86_64-darwin)
259+
sass-embedded (1.97.2-x86_64-darwin)
254260
google-protobuf (~> 4.31)
255-
sass-embedded (1.97.1-x86_64-linux-gnu)
261+
sass-embedded (1.97.2-x86_64-linux-gnu)
256262
google-protobuf (~> 4.31)
257-
sass-embedded (1.97.1-x86_64-linux-musl)
263+
sass-embedded (1.97.2-x86_64-linux-musl)
258264
google-protobuf (~> 4.31)
259265
sax-machine (1.3.2)
260266
securerandom (0.4.1)
@@ -293,7 +299,9 @@ DEPENDENCIES
293299
feedjira
294300
httparty
295301
jekyll
302+
jekyll-3rd-party-libraries
296303
jekyll-archives-v2
304+
jekyll-cache-bust
297305
jekyll-email-protect
298306
jekyll-feed
299307
jekyll-get-json

_plugins/cache-bust.rb

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)