Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Slate upgrade #4

Merged
merged 144 commits into from
Feb 15, 2023
Merged
Changes from 1 commit
Commits
Show all changes
144 commits
Select commit Hold shift + click to select a range
1be12d2
Update Vagrantfile to Ubuntu 18.04 (#1158)
bradthurber Oct 31, 2019
73e45c5
Ignore generated log file from running Vagrant
MasterOdin Oct 31, 2019
391f3d8
Update tested versions of ruby on Travis (#1160)
MasterOdin Oct 31, 2019
252a48b
Fully parse arguments first in deploy (#1153)
MasterOdin Nov 5, 2019
a4854b0
List maintainers in README (#1164)
lord Dec 3, 2019
375af3c
Install nodejs in Vagrantfile (#1202)
fernandoaguilar Feb 19, 2020
d11eb1f
add Dockerfile (#1124)
redhatxl Apr 2, 2020
7cecafe
add instructions to running docker to README
MasterOdin Apr 2, 2020
a8eb386
Remove line in README about Docker wiki
MasterOdin Apr 3, 2020
f31c738
update middleman dep to 4.3.6
MasterOdin Apr 3, 2020
88b28d4
update middleman-syntax and rouge to ~>3.2
MasterOdin Apr 3, 2020
5b25b04
update nokogiri to ~> 1.10.8
MasterOdin May 8, 2020
4f5b12f
add 2.5.0 release to changelog
MasterOdin May 9, 2020
33c4acc
update screenshot in README with new rouge styling (#1228)
MasterOdin May 12, 2020
aace071
fix bc style breaks from rouge 3.x (#1226)
MasterOdin May 12, 2020
589df5f
Change instructions to use templates instead of forking (#1234)
lord May 16, 2020
8c329dc
disable asset hash for woff and woff2 files out of the box (#1231)
MasterOdin May 18, 2020
8bea123
switch to using debian for docker base for bash (#1233)
MasterOdin May 18, 2020
3582930
update sassc to 2.3.0 in Gemfile.lock
MasterOdin May 19, 2020
f0e8682
v2.6.0 release
MasterOdin May 19, 2020
c7c9eaa
Update bug report templates, remove links to Spectrum (#1239)
lord May 21, 2020
ce2c034
Replace travis with github actions (#1240)
MasterOdin May 23, 2020
215e6ee
add missing middleman build step to deploy gh workflow
MasterOdin May 23, 2020
887f6bb
Replace README Getting Started with links to wiki (#1246)
MasterOdin May 28, 2020
fb25af5
Bump middleman from 4.3.6 to 4.3.7 (#1247)
dependabot-preview[bot] May 28, 2020
595b532
cut v2.6.1 release (#1249)
MasterOdin May 30, 2020
4df1048
Fix broken "Getting Started" link in README (#1251)
ritesh99rakesh Jun 1, 2020
fc7612c
Fix link to wiki in README (#1253)
Jun 4, 2020
297fa7c
master -> main (#1264)
lord Jun 20, 2020
7c288d9
Update deploy.yml (#1265)
lord Jun 20, 2020
933b1ae
Remove outdated special thanks section: README.md (#1267)
MikeRalphson Jun 21, 2020
1b78587
Fix username typo in changelog (#1256)
jakemack Jun 8, 2020
36f82aa
Update JavaScript dependencies (#1248)
MikeRalphson Jun 8, 2020
f3653ba
Bump rouge from 3.17.0 to 3.19.0 (#1242)
dependabot-preview[bot] Jun 8, 2020
0c7698a
mark files under source/javascripts/lib as vendored by GitHub statistics
MasterOdin Jun 10, 2020
80da331
Bump redcarpet from 3.4.0 to 3.5.0 (#1241)
dependabot-preview[bot] Jun 10, 2020
cfff5c1
Bump rouge from 3.19.0 to 3.20.0 (#1260)
dependabot-preview[bot] Jun 10, 2020
f8fd39f
[Security] Bump rack from 2.2.2 to 2.2.3 (#1262)
dependabot-preview[bot] Jun 16, 2020
f720bd9
use different rouge theme for printing (#1259)
MasterOdin Jun 17, 2020
bae7edc
add copy to clipboard icon to code boxes (#1258)
MasterOdin Jun 17, 2020
513e78f
Fix handling ToC selectors that contain punctuation (#1109)
gruis Jun 20, 2020
06478b9
fix language bar truncating long list of langs (#1266)
MasterOdin Jun 21, 2020
f390aba
Strip HTML tags from ToC element with regex before showing in title b…
atlc Jun 21, 2020
e28d4d6
cut 2.7.0 release (#1268)
MasterOdin Jun 22, 2020
a16b5b1
Remove extra space before date for 2.7.0
MasterOdin Jun 22, 2020
ed7dd53
Fix link from master to main branch
MasterOdin Jun 22, 2020
27624c1
Remove merge conflict lines from README (#1274)
mckayward Jun 24, 2020
b7e80e6
Bump rouge from 3.20.0 to 3.21.0 (#1285)
dependabot-preview[bot] Jul 31, 2020
d2e11a3
Bump nokogiri from 1.10.9 to 1.10.10 (#1282)
dependabot-preview[bot] Jul 31, 2020
616df62
trim ending newline on copied code (#1296)
MasterOdin Aug 10, 2020
985a75a
Rework docker image to be easier to use for development and deploymen…
MasterOdin Aug 10, 2020
49b3418
Bump middleman from 4.3.7 to 4.3.8 (#1302)
dependabot-preview[bot] Aug 13, 2020
cdd5c62
Bump middleman from 4.3.7 to 4.3.8 (#1302)
dependabot-preview[bot] Aug 13, 2020
6f24a0d
cut 2.7.1 release
MasterOdin Aug 13, 2020
7e80f34
Merge branch 'main' into dev
MasterOdin Aug 16, 2020
7441d83
Add deploy to gh-pages for dev branch (#1305)
MasterOdin Sep 10, 2020
db503c9
update actions/cache to v2 for gh workflows (#1314)
MasterOdin Sep 10, 2020
1f9f3a2
Remove outdated special thanks section in README.md (#1307)
MikeRalphson Sep 10, 2020
54d594c
Bump rouge from 3.21.0 to 3.23.0 (#1311)
dependabot-preview[bot] Sep 10, 2020
e313732
Bump middleman from 4.3.8 to 4.3.10 (#1316)
dependabot-preview[bot] Sep 11, 2020
b3f5fcb
Bump middleman from 4.3.10 to 4.3.11 (#1319)
dependabot-preview[bot] Sep 17, 2020
3af62c8
upgrade lunr to 2.3.9 (#1325)
MikeRalphson Sep 23, 2020
de961f5
Bump rouge from 3.23.0 to 3.24.0 (#1334)
dependabot-preview[bot] Oct 15, 2020
779658d
Dockerfile: allow Docker to cache build steps (#1336)
micvbang Oct 26, 2020
0e242e3
add docker deploy step to github workflows (#1321)
MasterOdin Oct 27, 2020
e40f9be
Fix shell code examples to have line continuations (#1324)
MasterOdin Oct 27, 2020
24b1d1f
cut 2.8.0 release
MasterOdin Oct 27, 2020
ede86c3
Update command to fetch latest commit for issue template (#1342)
MasterOdin Nov 10, 2020
d46c55f
add docker version badge to README
MasterOdin Oct 28, 2020
e546ad5
Fix vagrant issue: use exact version of bundler (#1355)
victorevector Dec 17, 2020
b963852
Bump rouge from 3.24.0 to 3.25.0 (#1343)
dependabot-preview[bot] Nov 11, 2020
a3dee6a
Bump rouge from 3.25.0 to 3.26.0 (#1350)
dependabot-preview[bot] Dec 9, 2020
b5ac2a1
Bump redcarpet from 3.5.0 to 3.5.1 (#1352)
dependabot-preview[bot] Dec 16, 2020
10d4a53
Update link to ruby languages in README (#1351)
MasterOdin Dec 17, 2020
a1e14a5
Remove scale from README examples (#1363)
hdsheena Jan 14, 2021
72f91e2
Drop support for Ruby 2.3 and 2.4 (#1366)
MasterOdin Jan 14, 2021
6163c81
Update supported ruby version in Gemfile
MasterOdin Jan 14, 2021
6e9d009
[Security] Bump nokogiri from 1.10.10 to 1.11.0 (#1360)
dependabot-preview[bot] Jan 15, 2021
200e4c0
Bump nokogiri from 1.11.0 to 1.11.1 (#1370)
dependabot-preview[bot] Jan 18, 2021
b56d145
Update changelog for 2.9.0
MasterOdin Jan 18, 2021
11bcd78
Specify slate is not Ruby 3.0 compatible
MasterOdin Jan 18, 2021
e3a3a3a
Fix changelog entry for 2.9.0
MasterOdin Jan 26, 2021
681f481
Add guards around localStorage in case user disables it (#1399)
MasterOdin Feb 25, 2021
8488edf
cut 2.9.1 release (#1400)
MasterOdin Feb 27, 2021
9aed546
Bump nokogiri from 1.11.1 to 1.11.2 (#1407)
dependabot-preview[bot] Mar 14, 2021
3519c55
[Security] Bump kramdown from 2.3.0 to 2.3.1 (#1416)
dependabot-preview[bot] Mar 29, 2021
fa3a7cf
cut 2.9.2 release
MasterOdin Mar 30, 2021
e08e38c
Bump nokogiri from 1.11.2 to 1.11.3 (#1425)
dependabot-preview[bot] Apr 8, 2021
bf2f1eb
Make slate compatible with ruby 3.0.0 (#1424)
shaun-scale Apr 8, 2021
161eb66
Add git to Dockerfile (#1426)
MasterOdin Apr 8, 2021
91ae1d2
Bump middleman from `0c950d8` to `d180ca3` (#1427)
dependabot-preview[bot] Apr 13, 2021
7a555b5
cut 2.10.0 release (#1428)
MasterOdin Apr 16, 2021
50c9271
Upgrade to GitHub-native Dependabot (#1435)
dependabot-preview[bot] Apr 29, 2021
8382572
Bump nokogiri from 1.11.3 to 1.11.5 (#1446)
dependabot[bot] May 24, 2021
3164dd9
Bump middleman-autoprefixer from 2.10.1 to 3.0.0 (#1445)
dependabot[bot] May 24, 2021
56f452f
Bump nokogiri from 1.11.5 to 1.11.6 (#1450)
dependabot[bot] May 31, 2021
ef09832
Support specifying custom meta tags in YAML (#1453)
MasterOdin May 31, 2021
01b425b
Set minimum supported version of nokogiri to 1.11.4
MasterOdin May 31, 2021
8a5877f
Add sample usage of meta frontmatter to layout
MasterOdin May 31, 2021
7f42fd4
Update jquery to 3.6.0 (#1458)
MasterOdin Jun 17, 2021
9ff4200
Bump middleman from d180ca3 to 4.4.0 (#1474)
MasterOdin Jun 18, 2021
e846fe2
Bump nokogiri from 1.11.6 to 1.11.7 (#1459)
dependabot[bot] Jun 18, 2021
5531a56
Fix incorrect ruby-version parameter in deploy GitHub Actions (#1489)
itskingori Jul 28, 2021
47086f7
Bump addressable from 2.7.0 to 2.8.0 (#1484)
dependabot[bot] Aug 3, 2021
4a68e7b
Bump nokogiri from 1.11.7 to 1.12.1 (#1492)
dependabot[bot] Aug 3, 2021
21a9bb7
Bump nokogiri from 1.12.1 to 1.12.3 (#1496)
dependabot[bot] Aug 12, 2021
e5b4d9d
cut 2.11.0 release (#1455)
MasterOdin Aug 27, 2021
fd90cb7
Bump nokogiri from 1.12.3 to 1.12.4 (#1499)
dependabot[bot] Aug 30, 2021
2cb0580
Add CoinAPI to README examples (#1497)
Svisstack Aug 30, 2021
7b59ffc
Bump rouge from 3.26.0 to 3.26.1 (#1507)
dependabot[bot] Sep 18, 2021
7df143f
Bump nokogiri from 1.12.4 to 1.12.5 (#1511)
dependabot[bot] Sep 27, 2021
8ef49dc
Bump ffi from 1.15.0 to 1.15.4 (#1510)
Oct 28, 2021
fd23167
Limit GITHUB_TOKEN scope for workflows (#1522)
MasterOdin Oct 28, 2021
5a741f4
Ignore more files in docker images (#1523)
MasterOdin Oct 28, 2021
5b8efce
Bump middleman from 4.4.0 to 4.4.2 (#1530)
dependabot[bot] Nov 4, 2021
44f6142
Bump version to 2.12.0 (#1524)
MasterOdin Nov 13, 2021
cbfe771
Bump rouge from 3.26.1 to 3.27.0 (#1544)
dependabot[bot] Dec 16, 2021
c74a938
Add ruby 3.1 to test suite (#1553)
enomotodev Jan 6, 2022
9c98b1f
Bump rouge from 3.27.0 to 3.28.0 (#1574)
dependabot[bot] Feb 4, 2022
0af1c01
Add support to build multi-arch docker images (#1587)
MasterOdin Mar 3, 2022
6208332
Drop support for Ruby 2.5 (#1588)
MasterOdin Mar 23, 2022
5418779
Bump nokogiri from 1.12.5 to 1.13.3 (#1585)
dependabot[bot] Mar 23, 2022
b7a5658
Bump nokogiri from 1.13.3 to 1.13.4 (#1604)
dependabot[bot] Apr 11, 2022
dc4ce03
Remove VOLUME declaration from Dockerfile (#1607)
aemengo Apr 22, 2022
e352596
Bump version to 2.13.0 (#1606)
MasterOdin Apr 23, 2022
6168cd4
Remove extra * from changelog date
MasterOdin Apr 23, 2022
848d9ee
Fix version ranges for rouge and nokogiri in 2.13.0 release
MasterOdin Apr 23, 2022
63eee65
Bump nokogiri from 1.13.4 to 1.13.5 (#1612)
dependabot[bot] May 5, 2022
d8225be
Fix Vagrantfile gem install for ruby >= 2.6 (#1618)
Cyb0rk Jun 24, 2022
0ef68b7
Bump rouge from 3.28.0 to 3.29.0 (#1621)
dependabot[bot] Jun 24, 2022
6115480
Bump nokogiri from 1.13.5 to 1.13.6 (#1614)
dependabot[bot] Jun 24, 2022
22ddbe3
Expand deprecated git.io links to full url (#1611)
judge2020 Jun 24, 2022
fa73871
Bump nokogiri from 1.13.6 to 1.13.7 (#1639)
dependabot[bot] Jul 12, 2022
009bd06
Bump nokogiri from 1.13.7 to 1.13.8 (#1643)
dependabot[bot] Jul 26, 2022
eb32e1b
Bump rouge from 3.29.0 to 3.30.0 (#1646)
dependabot[bot] Sep 13, 2022
9ab7838
Bump middleman-syntax from 3.2.0 to 3.3.0 (#1648)
dependabot[bot] Sep 13, 2022
9f927c1
Disable file watcher in run_build() for the sake of qemu on arm64 (#1…
anapsix Sep 13, 2022
10d4c77
Bump nokogiri from 1.13.8 to 1.13.9 (#1676)
dependabot[bot] Oct 18, 2022
2a2e60f
Bump redcarpet from 3.5.1 to 3.6.0 (#1715)
dependabot[bot] Jan 31, 2023
a43bf2a
Bump webrick from 1.7.0 to 1.8.1 (#1713)
dependabot[bot] Jan 31, 2023
bc3f155
Bump middleman from 4.4.2 to 4.4.3 (#1682)
dependabot[bot] Jan 31, 2023
2f73193
Add margin to paragraph following code-block on phones (#1637)
tlhunter Jan 31, 2023
fc2e92b
Bump version to 2.13.1 (#1661)
MasterOdin Jan 31, 2023
489572e
Merge remote-tracking branch 'upstream/main' into slate-upgrade
fulf Feb 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
master -> main (#1264)
lord authored Jun 20, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 297fa7ce4475d91a3327ffdfa07908f886478ce7
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<p align="center">
<img src="https://raw.githubusercontent.com/slatedocs/img/master/logo-slate.png" alt="Slate: API Documentation Generator" width="226">
<img src="https://raw.githubusercontent.com/slatedocs/img/main/logo-slate.png" alt="Slate: API Documentation Generator" width="226">
<br>
<a href="https://github.com/slatedocs/slate/actions?query=workflow%3ABuild+branch%3Amaster"><img src="https://github.com/slatedocs/slate/workflows/Build/badge.svg?branch=master" alt="Build Status"></a>
<a href="https://github.com/slatedocs/slate/actions?query=workflow%3ABuild+branch%3Amain"><img src="https://github.com/slatedocs/slate/workflows/Build/badge.svg?branch=main" alt="Build Status"></a>
</p>

<p align="center">Slate helps you create beautiful, intelligent, responsive API documentation.</p>

<p align="center"><img src="https://raw.githubusercontent.com/slatedocs/img/master/screenshot-slate.png" width=700 alt="Screenshot of Example Documentation created with Slate"></p>
<p align="center"><img src="https://raw.githubusercontent.com/slatedocs/img/main/screenshot-slate.png" width=700 alt="Screenshot of Example Documentation created with Slate"></p>

<p align="center"><em>The example above was created with Slate. Check it out at <a href="https://slatedocs.github.io/slate">slatedocs.github.io/slate</a>.</em></p>

2 changes: 1 addition & 1 deletion deploy.sh
Original file line number Diff line number Diff line change
@@ -154,7 +154,7 @@ incremental_deploy() {
0) echo No changes to files in $deploy_directory. Skipping commit.;;
1) commit+push;;
*)
echo git diff exited with code $diff. Aborting. Staying on branch $deploy_branch so you can debug. To switch back to master, use: git symbolic-ref HEAD refs/heads/master && git reset --mixed >&2
echo git diff exited with code $diff. Aborting. Staying on branch $deploy_branch so you can debug. To switch back to main, use: git symbolic-ref HEAD refs/heads/main && git reset --mixed >&2
return $diff
;;
esac