Skip to content

Commit 8a71b67

Browse files
authored
Merge pull request #1 from alshedivat/main
pull changes from origin-main into fork
2 parents 739401e + ae741aa commit 8a71b67

5 files changed

Lines changed: 75 additions & 54 deletions

File tree

FAQ.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
Here are some frequently asked questions. If you have a different question, please check if it was not already answered in the Q&A section of the [GitHub Discussions](https://github.com/alshedivat/al-folio/discussions/categories/q-a). If not, feel free to ask a new question there.
44

55
<!--ts-->
6+
67
- [Frequently Asked Questions](#frequently-asked-questions)
78
- [After I create a new repository from this template and setup the repo, I get a deployment error. Isn't the website supposed to correctly deploy automatically?](#after-i-create-a-new-repository-from-this-template-and-setup-the-repo-i-get-a-deployment-error-isnt-the-website-supposed-to-correctly-deploy-automatically)
89
- [I am using a custom domain (e.g., foo.com). My custom domain becomes blank in the repository settings after each deployment. How do I fix that?](#i-am-using-a-custom-domain-eg-foocom-my-custom-domain-becomes-blank-in-the-repository-settings-after-each-deployment-how-do-i-fix-that)
@@ -20,6 +21,7 @@ Here are some frequently asked questions. If you have a different question, plea
2021
- [How can I update Tabler Icons version on the template](#how-can-i-update-tabler-icons-version-on-the-template)
2122
- [What do all these GitHub actions/workflows mean?](#what-do-all-these-github-actionsworkflows-mean)
2223
- [How can I use Google Search Console ID on the template?](#how-can-i-use-google-search-console-id-on-the-template)
24+
2325
<!--te-->
2426

2527
## After I create a new repository from this template and setup the repo, I get a deployment error. Isn't the website supposed to correctly deploy automatically?

Gemfile.lock

Lines changed: 66 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -37,69 +37,81 @@ GEM
3737
namae (~> 1.0)
3838
observer (< 1.0)
3939
open-uri (< 1.0)
40-
citeproc-ruby (1.1.14)
40+
citeproc-ruby (2.1.1)
4141
citeproc (~> 1.0, >= 1.0.9)
42-
csl (~> 1.6)
42+
csl (~> 2.0)
43+
observer (< 1.0)
4344
classifier-reborn (2.3.0)
4445
fast-stemmer (~> 1.0)
4546
matrix (~> 0.4)
4647
colorator (1.1.0)
4748
concurrent-ruby (1.3.5)
48-
connection_pool (2.5.0)
49+
connection_pool (2.5.3)
4950
crass (1.0.6)
50-
csl (1.6.0)
51-
namae (~> 1.0)
52-
rexml
53-
csl-styles (1.0.1.11)
54-
csl (~> 1.0)
51+
csl (2.1.0)
52+
forwardable (~> 1.3)
53+
namae (~> 1.2)
54+
open-uri (< 1.0)
55+
rexml (~> 3.0)
56+
set (~> 1.1)
57+
singleton (< 1.0)
58+
time (< 1.0)
59+
csl-styles (2.0.1)
60+
csl (~> 2.0)
5561
css_parser (1.21.1)
5662
addressable
5763
cssminify2 (2.0.1)
58-
csv (3.3.3)
64+
csv (3.3.4)
5965
date (3.4.1)
6066
deep_merge (1.2.2)
61-
drb (2.2.1)
67+
drb (2.2.3)
6268
em-websocket (0.5.3)
6369
eventmachine (>= 0.12.9)
6470
http_parser.rb (~> 0)
6571
eventmachine (1.2.7)
6672
execjs (2.10.0)
6773
fast-stemmer (1.0.2)
68-
feedjira (3.2.4)
74+
feedjira (3.2.5)
6975
loofah (>= 2.3.1, < 3)
7076
sax-machine (>= 1.0, < 2)
71-
ffi (1.17.1-aarch64-linux-gnu)
72-
ffi (1.17.1-aarch64-linux-musl)
73-
ffi (1.17.1-arm-linux-gnu)
74-
ffi (1.17.1-arm-linux-musl)
75-
ffi (1.17.1-arm64-darwin)
76-
ffi (1.17.1-x86_64-darwin)
77-
ffi (1.17.1-x86_64-linux-gnu)
78-
ffi (1.17.1-x86_64-linux-musl)
77+
ffi (1.17.2-aarch64-linux-gnu)
78+
ffi (1.17.2-aarch64-linux-musl)
79+
ffi (1.17.2-arm-linux-gnu)
80+
ffi (1.17.2-arm-linux-musl)
81+
ffi (1.17.2-arm64-darwin)
82+
ffi (1.17.2-x86_64-darwin)
83+
ffi (1.17.2-x86_64-linux-gnu)
84+
ffi (1.17.2-x86_64-linux-musl)
7985
forwardable (1.3.3)
8086
forwardable-extended (2.6.0)
8187
gemoji (4.1.0)
82-
google-protobuf (4.30.1)
88+
google-protobuf (4.31.0)
89+
bigdecimal
90+
rake (>= 13)
91+
google-protobuf (4.31.0-aarch64-linux-gnu)
92+
bigdecimal
93+
rake (>= 13)
94+
google-protobuf (4.31.0-aarch64-linux-musl)
8395
bigdecimal
8496
rake (>= 13)
85-
google-protobuf (4.30.1-aarch64-linux)
97+
google-protobuf (4.31.0-arm64-darwin)
8698
bigdecimal
8799
rake (>= 13)
88-
google-protobuf (4.30.1-arm64-darwin)
100+
google-protobuf (4.31.0-x86_64-darwin)
89101
bigdecimal
90102
rake (>= 13)
91-
google-protobuf (4.30.1-x86_64-darwin)
103+
google-protobuf (4.31.0-x86_64-linux-gnu)
92104
bigdecimal
93105
rake (>= 13)
94-
google-protobuf (4.30.1-x86_64-linux)
106+
google-protobuf (4.31.0-x86_64-linux-musl)
95107
bigdecimal
96108
rake (>= 13)
97109
html-pipeline (2.14.3)
98110
activesupport (>= 2)
99111
nokogiri (>= 1.4)
100112
htmlcompressor (0.4.0)
101113
http_parser.rb (0.8.0)
102-
httparty (0.22.0)
114+
httparty (0.23.1)
103115
csv
104116
mini_mime (>= 1.0.0)
105117
multi_xml (>= 0.5.2)
@@ -149,10 +161,10 @@ GEM
149161
jekyll-regex-replace (1.1.0)
150162
jekyll-sass-converter (3.1.0)
151163
sass-embedded (~> 1.75)
152-
jekyll-scholar (7.1.3)
164+
jekyll-scholar (7.2.0)
153165
bibtex-ruby (~> 6.0)
154-
citeproc-ruby (~> 1.0)
155-
csl-styles (~> 1.0)
166+
citeproc-ruby (~> 2.0)
167+
csl-styles (~> 2.0)
156168
jekyll (~> 4.0)
157169
jekyll-sitemap (1.4.0)
158170
jekyll (>= 3.7, < 5.0)
@@ -168,7 +180,7 @@ GEM
168180
gemoji (>= 3, < 5)
169181
html-pipeline (~> 2.2)
170182
jekyll (>= 3.0, < 5.0)
171-
json (2.10.2)
183+
json (2.12.2)
172184
json-minify (0.0.3)
173185
json (> 0)
174186
kramdown (2.5.1)
@@ -180,15 +192,15 @@ GEM
180192
listen (3.9.0)
181193
rb-fsevent (~> 0.10, >= 0.10.3)
182194
rb-inotify (~> 0.9, >= 0.9.10)
183-
logger (1.6.6)
184-
loofah (2.24.0)
195+
logger (1.7.0)
196+
loofah (2.24.1)
185197
crass (~> 1.0.2)
186198
nokogiri (>= 1.12.0)
187199
matrix (0.4.2)
188200
mercenary (0.4.0)
189201
mini_mime (1.1.5)
190202
minitest (5.25.5)
191-
multi_xml (0.7.1)
203+
multi_xml (0.7.2)
192204
bigdecimal (~> 3.1)
193205
namae (1.2.0)
194206
racc (~> 1.7)
@@ -216,34 +228,36 @@ GEM
216228
ostruct (0.6.1)
217229
pathutil (0.16.2)
218230
forwardable-extended (~> 2.6)
219-
public_suffix (6.0.1)
231+
public_suffix (6.0.2)
220232
racc (1.8.1)
221233
rake (13.2.1)
222234
rb-fsevent (0.11.2)
223235
rb-inotify (0.11.1)
224236
ffi (~> 1.0)
225237
rexml (3.4.1)
226-
rouge (4.5.1)
238+
rouge (4.5.2)
227239
safe_yaml (1.0.5)
228-
sass-embedded (1.86.0-aarch64-linux-gnu)
229-
google-protobuf (~> 4.30)
230-
sass-embedded (1.86.0-aarch64-linux-musl)
231-
google-protobuf (~> 4.30)
232-
sass-embedded (1.86.0-arm-linux-gnueabihf)
233-
google-protobuf (~> 4.30)
234-
sass-embedded (1.86.0-arm-linux-musleabihf)
235-
google-protobuf (~> 4.30)
236-
sass-embedded (1.86.0-arm64-darwin)
237-
google-protobuf (~> 4.30)
238-
sass-embedded (1.86.0-x86_64-darwin)
239-
google-protobuf (~> 4.30)
240-
sass-embedded (1.86.0-x86_64-linux-gnu)
241-
google-protobuf (~> 4.30)
242-
sass-embedded (1.86.0-x86_64-linux-musl)
243-
google-protobuf (~> 4.30)
240+
sass-embedded (1.89.0-aarch64-linux-gnu)
241+
google-protobuf (~> 4.31)
242+
sass-embedded (1.89.0-aarch64-linux-musl)
243+
google-protobuf (~> 4.31)
244+
sass-embedded (1.89.0-arm-linux-gnueabihf)
245+
google-protobuf (~> 4.31)
246+
sass-embedded (1.89.0-arm-linux-musleabihf)
247+
google-protobuf (~> 4.31)
248+
sass-embedded (1.89.0-arm64-darwin)
249+
google-protobuf (~> 4.31)
250+
sass-embedded (1.89.0-x86_64-darwin)
251+
google-protobuf (~> 4.31)
252+
sass-embedded (1.89.0-x86_64-linux-gnu)
253+
google-protobuf (~> 4.31)
254+
sass-embedded (1.89.0-x86_64-linux-musl)
255+
google-protobuf (~> 4.31)
244256
sax-machine (1.3.2)
245257
securerandom (0.4.1)
246-
stringio (3.1.5)
258+
set (1.1.2)
259+
singleton (0.3.0)
260+
stringio (3.1.7)
247261
terminal-table (3.0.2)
248262
unicode-display_width (>= 1.1.1, < 3)
249263
terser (1.2.5)
@@ -299,4 +313,4 @@ DEPENDENCIES
299313
ostruct
300314

301315
BUNDLED WITH
302-
2.6.6
316+
2.6.9

INSTALL.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Installing and Deploying
22

33
<!--ts-->
4+
45
- [Installing and Deploying](#installing-and-deploying)
56
- [Recommended Approach](#recommended-approach)
67
- [Local setup on Windows](#local-setup-on-windows)
@@ -18,6 +19,7 @@
1819
- [Deployment to another hosting server (non GitHub Pages)](#deployment-to-another-hosting-server-non-github-pages)
1920
- [Deployment to a separate repository (advanced users only)](#deployment-to-a-separate-repository-advanced-users-only)
2021
- [Upgrading from a previous version](#upgrading-from-a-previous-version)
22+
2123
<!--te-->
2224

2325
## Recommended Approach
@@ -241,7 +243,7 @@ If you installed **al-folio** as described above, you can manually update your c
241243
# Assuming the current directory is <your-repo-name>
242244
$ git remote add upstream https://github.com/alshedivat/al-folio.git
243245
$ git fetch upstream
244-
$ git rebase v0.14.4
246+
$ git rebase v0.14.6
245247
```
246248

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

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ Feel free to add your own page(s) by sending a PR.
162162
<a href="https://nishanthjkumar.com/" target="_blank">★</a>
163163
<a href="https://joszuijderwijk.nl/" target="_blank">★</a>
164164
<a href="https://d-jiao.github.io/" target="_blank">★</a>
165+
<a href="https://cbuelt.github.io/" target="_blank">★</a>
166+
<a href="https://mehrdad-noori.github.io/" target="_blank">★</a>
165167
</td>
166168
</tr>
167169
<tr>
@@ -176,6 +178,7 @@ Feel free to add your own page(s) by sending a PR.
176178
<a href="https://inbt.jhu.edu/epidiagnostics/" target="_blank">★</a>
177179
<a href="https://www.nuesl.org/" target="_blank">★</a>
178180
<a href="https://big-culture.github.io/" target="_blank">★</a>
181+
<a href="https://gpforesteyes.github.io/" target="_blank">★</a>
179182
</td>
180183
</tr>
181184
<tr>

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: amirpourmand/al-folio:v0.14.4
4+
image: amirpourmand/al-folio:v0.14.6
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)