Skip to content

Commit c92b759

Browse files
committed
Merge branch 'al-folio-main'
2 parents 2315997 + 17b0251 commit c92b759

File tree

6 files changed

+29
-75
lines changed

6 files changed

+29
-75
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ gem 'jekyll'
66
group :jekyll_plugins do
77
gem 'jekyll-3rd-party-libraries'
88
gem 'jekyll-archives-v2'
9+
gem 'jekyll-cache-bust'
910
gem 'jekyll-email-protect'
1011
gem 'jekyll-feed'
1112
gem 'jekyll-get-json'

Gemfile.lock

Lines changed: 24 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)
@@ -144,6 +144,8 @@ GEM
144144
jekyll-archives-v2 (0.0.6)
145145
activesupport
146146
jekyll (>= 3.6, < 5.0)
147+
jekyll-cache-bust (0.0.1)
148+
jekyll (>= 3.6, < 5.0)
147149
jekyll-email-protect (1.1.0)
148150
jekyll-feed (0.17.0)
149151
jekyll (>= 3.7, < 5.0)
@@ -168,7 +170,7 @@ GEM
168170
jekyll-regex-replace (1.1.0)
169171
jekyll-sass-converter (3.1.0)
170172
sass-embedded (~> 1.75)
171-
jekyll-scholar (7.2.3)
173+
jekyll-scholar (7.3.0)
172174
bibtex-ruby (~> 6.0)
173175
citeproc-ruby (>= 2.1.6)
174176
csl-styles (~> 2.0)
@@ -194,7 +196,7 @@ GEM
194196
rexml (>= 3.3.9)
195197
kramdown-parser-gfm (1.1.0)
196198
kramdown (~> 2.0)
197-
latex-decode (0.4.0)
199+
latex-decode (0.4.2)
198200
liquid (4.0.4)
199201
listen (3.9.0)
200202
rb-fsevent (~> 0.10, >= 0.10.3)
@@ -208,7 +210,7 @@ GEM
208210
mini_mime (1.1.5)
209211
minitest (6.0.1)
210212
prism (~> 1.5)
211-
multi_xml (0.8.0)
213+
multi_xml (0.8.1)
212214
bigdecimal (>= 3.1, < 5)
213215
namae (1.2.0)
214216
racc (~> 1.7)
@@ -236,8 +238,8 @@ GEM
236238
ostruct (0.6.3)
237239
pathutil (0.16.2)
238240
forwardable-extended (~> 2.6)
239-
prism (1.7.0)
240-
public_suffix (7.0.0)
241+
prism (1.8.0)
242+
public_suffix (7.0.2)
241243
racc (1.8.1)
242244
rake (13.3.1)
243245
rb-fsevent (0.11.2)
@@ -246,21 +248,21 @@ GEM
246248
rexml (3.4.4)
247249
rouge (4.7.0)
248250
safe_yaml (1.0.5)
249-
sass-embedded (1.97.1-aarch64-linux-gnu)
251+
sass-embedded (1.97.2-aarch64-linux-gnu)
250252
google-protobuf (~> 4.31)
251-
sass-embedded (1.97.1-aarch64-linux-musl)
253+
sass-embedded (1.97.2-aarch64-linux-musl)
252254
google-protobuf (~> 4.31)
253-
sass-embedded (1.97.1-arm-linux-gnueabihf)
255+
sass-embedded (1.97.2-arm-linux-gnueabihf)
254256
google-protobuf (~> 4.31)
255-
sass-embedded (1.97.1-arm-linux-musleabihf)
257+
sass-embedded (1.97.2-arm-linux-musleabihf)
256258
google-protobuf (~> 4.31)
257-
sass-embedded (1.97.1-arm64-darwin)
259+
sass-embedded (1.97.2-arm64-darwin)
258260
google-protobuf (~> 4.31)
259-
sass-embedded (1.97.1-x86_64-darwin)
261+
sass-embedded (1.97.2-x86_64-darwin)
260262
google-protobuf (~> 4.31)
261-
sass-embedded (1.97.1-x86_64-linux-gnu)
263+
sass-embedded (1.97.2-x86_64-linux-gnu)
262264
google-protobuf (~> 4.31)
263-
sass-embedded (1.97.1-x86_64-linux-musl)
265+
sass-embedded (1.97.2-x86_64-linux-musl)
264266
google-protobuf (~> 4.31)
265267
sax-machine (1.3.2)
266268
securerandom (0.4.1)
@@ -301,6 +303,7 @@ DEPENDENCIES
301303
jekyll
302304
jekyll-3rd-party-libraries
303305
jekyll-archives-v2
306+
jekyll-cache-bust
304307
jekyll-email-protect
305308
jekyll-feed
306309
jekyll-get-json

INSTALL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
- [For project pages](#for-project-pages)
1616
- [Enabling automatic deployment](#enabling-automatic-deployment)
1717
- [Manual deployment to GitHub Pages](#manual-deployment-to-github-pages)
18-
- [Deploy on <a href="https://www.netlify.com/" rel="nofollow">Netlify</a>](https://www.netlify.com/)
18+
- [Deploy on Netlify](#deploy-on-netlify)
1919
- [Deployment to another hosting server (non GitHub Pages)](#deployment-to-another-hosting-server-non-github-pages)
2020
- [Deployment to a separate repository (advanced users only)](#deployment-to-a-separate-repository-advanced-users-only)
2121
- [Upgrading from a previous version](#upgrading-from-a-previous-version)
@@ -241,7 +241,7 @@ If you installed **multi-language-al-folio** as described above, you can manuall
241241
# Assuming the current directory is <your-repo-name>
242242
$ git remote add upstream https://github.com/george-gca/multi-language-al-folio.git
243243
$ git fetch upstream
244-
$ git rebase v1.15.0
244+
$ git rebase v1.15.1
245245
```
246246

247247
If you have extensively customized a previous version, it might be trickier to upgrade.

_config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ keep_files:
214214
plugins:
215215
- jekyll-3rd-party-libraries
216216
- jekyll-archives-v2
217+
- jekyll-cache-bust
217218
- jekyll-email-protect
218219
- jekyll-feed
219220
- jekyll-get-json

_plugins/cache-bust.rb

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

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# this file uses prebuilt image in dockerhub
22
services:
33
jekyll:
4-
image: georgegca/multi-language-al-folio:v1.15.0
4+
image: georgegca/multi-language-al-folio:v1.15.1
55
build: .
66
# uncomment these if you are having this issue with the build:
77
# /usr/local/bundle/gems/jekyll-4.3.4/lib/jekyll/site.rb:509:in `initialize': Permission denied @ rb_sysopen - /srv/jekyll/.jekyll-cache/.gitignore (Errno::EACCES)

0 commit comments

Comments
 (0)