Skip to content

Commit 26233eb

Browse files
committed
Merge branch '5.x' into 5.next
2 parents 904b6f9 + 1e3be69 commit 26233eb

176 files changed

Lines changed: 4478 additions & 3372 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/cspell.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@
6464
"Classes",
6565
"Redirect",
6666
"Layout",
67-
"full"
67+
"full",
68+
"olde",
69+
"olle"
6870
],
6971
"ignoreRegExpList": [
7072
"\\$[a-zA-Z_][a-zA-Z0-9_]*",

.github/markdownlint.json

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
22
"default": true,
3-
"heading-increment": false,
4-
"no-hard-tabs": false,
5-
"no-multiple-blanks": false,
3+
"heading-increment": true,
4+
"no-hard-tabs": true,
5+
"no-multiple-blanks": true,
66
"line-length": false,
7-
"commands-show-output": false,
8-
"blanks-around-headings": false,
7+
"commands-show-output": true,
8+
"blanks-around-headings": true,
9+
"heading-start-left": true,
910
"no-duplicate-heading": false,
1011
"single-h1": false,
1112
"no-trailing-punctuation": false,
1213
"no-blanks-blockquote": false,
13-
"list-marker-space": false,
14-
"blanks-around-fences": false,
15-
"blanks-around-lists": false,
14+
"list-marker-space": true,
15+
"blanks-around-fences": true,
16+
"blanks-around-lists": true,
1617
"no-inline-html": {
1718
"allowed_elements": [
1819
"Badge",
@@ -33,18 +34,42 @@
3334
"svg",
3435
"path",
3536
"figure",
36-
"p"
37+
"p",
38+
"colgroup",
39+
"col",
40+
"strong",
41+
"sup",
42+
"section",
43+
"hr",
44+
"ol",
45+
"ul",
46+
"li",
47+
"em",
48+
"code"
3749
]
3850
},
39-
"no-bare-urls": false,
40-
"fenced-code-language": false,
51+
"no-bare-urls": true,
52+
"fenced-code-language": true,
4153
"first-line-heading": false,
4254
"code-block-style": false,
43-
"single-trailing-newline": false,
55+
"code-fence-style": {
56+
"style": "backtick"
57+
},
58+
"emphasis-style": {
59+
"style": "asterisk"
60+
},
61+
"strong-style": {
62+
"style": "asterisk"
63+
},
64+
"spaces-after-emphasis-marker": true,
65+
"spaces-after-code-fence-info": true,
66+
"spaces-inside-emphasis-markers": true,
67+
"spaces-inside-code-span-elements": true,
68+
"single-trailing-newline": true,
4469
"link-fragments": false,
45-
"table-pipe-style": false,
70+
"table-pipe-style": "leading_and_trailing",
4671
"table-column-count": false,
47-
"emphasis-style": false,
4872
"table-column-style": false,
49-
"descriptive-link-text": false
73+
"descriptive-link-text": false,
74+
"no-emphasis-as-heading": false
5075
}

.github/workflows/deploy_5.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Cloning repo
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919
with:
2020
fetch-depth: 0
2121

.github/workflows/docs-validation.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525

2626
steps:
2727
- name: Checkout code
28-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2929

3030
- name: Validate config.js syntax
3131
run: node --check config.js
@@ -36,7 +36,7 @@ jobs:
3636

3737
steps:
3838
- name: Checkout code
39-
uses: actions/checkout@v5
39+
uses: actions/checkout@v6
4040

4141
- name: Validate JSON syntax
4242
run: |
@@ -54,7 +54,7 @@ jobs:
5454

5555
steps:
5656
- name: Checkout code
57-
uses: actions/checkout@v5
57+
uses: actions/checkout@v6
5858

5959
- name: Lint markdown files
6060
uses: articulate/actions-markdownlint@v1
@@ -69,10 +69,10 @@ jobs:
6969

7070
steps:
7171
- name: Checkout code
72-
uses: actions/checkout@v5
72+
uses: actions/checkout@v6
7373

7474
- name: Check spelling
75-
uses: streetsidesoftware/cspell-action@v5
75+
uses: streetsidesoftware/cspell-action@v8
7676
with:
7777
files: 'docs/**/*.md'
7878
config: '.github/cspell.json'
@@ -84,7 +84,7 @@ jobs:
8484

8585
steps:
8686
- name: Checkout code
87-
uses: actions/checkout@v5
87+
uses: actions/checkout@v6
8888
with:
8989
fetch-depth: 0
9090

0 commit comments

Comments
 (0)