Skip to content

Commit e9ded26

Browse files
authored
Merge branch 'main' into issue-updates
2 parents b805631 + 1d275c1 commit e9ded26

31 files changed

+1221
-110
lines changed

.eslintrc.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ plugins:
1212
- "@eslint-community/eslint-plugin-eslint-comments"
1313
- "@stylistic/eslint-plugin-js"
1414
- eslint-plugin-array-func
15+
- eslint-plugin-github
1516
- eslint-plugin-i
1617
- eslint-plugin-jquery
1718
- eslint-plugin-no-jquery
@@ -209,6 +210,29 @@ rules:
209210
func-names: [0]
210211
func-style: [0]
211212
getter-return: [2]
213+
github/a11y-aria-label-is-well-formatted: [0]
214+
github/a11y-no-title-attribute: [0]
215+
github/a11y-no-visually-hidden-interactive-element: [0]
216+
github/a11y-role-supports-aria-props: [0]
217+
github/a11y-svg-has-accessible-name: [0]
218+
github/array-foreach: [0]
219+
github/async-currenttarget: [2]
220+
github/async-preventdefault: [2]
221+
github/authenticity-token: [0]
222+
github/get-attribute: [0]
223+
github/js-class-name: [0]
224+
github/no-blur: [0]
225+
github/no-d-none: [0]
226+
github/no-dataset: [2]
227+
github/no-dynamic-script-tag: [2]
228+
github/no-implicit-buggy-globals: [2]
229+
github/no-inner-html: [0]
230+
github/no-innerText: [2]
231+
github/no-then: [2]
232+
github/no-useless-passive: [2]
233+
github/prefer-observers: [2]
234+
github/require-passive-events: [2]
235+
github/unescaped-html-literal: [0]
212236
grouped-accessor-pairs: [2]
213237
guard-for-in: [0]
214238
id-blacklist: [0]

.markdownlint.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@ heading-increment: false
55
line-length: {code_blocks: false, tables: false, stern: true, line_length: -1}
66
no-alt-text: false
77
no-bare-urls: false
8-
no-blanks-blockquote: false
98
no-emphasis-as-heading: false
109
no-empty-links: false
1110
no-hard-tabs: {code_blocks: false}
1211
no-inline-html: false
1312
no-space-in-code: false
1413
no-space-in-emphasis: false
15-
no-trailing-punctuation: false
1614
no-trailing-spaces: {br_spaces: 0}
1715
single-h1: false

build/generate-images.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,8 @@ async function main() {
7979
]);
8080
}
8181

82-
main().then(exit).catch(exit);
82+
try {
83+
exit(await main());
84+
} catch (err) {
85+
exit(err);
86+
}

build/generate-svg.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,8 @@ async function main() {
6363
]);
6464
}
6565

66-
main().then(exit).catch(exit);
66+
try {
67+
exit(await main());
68+
} catch (err) {
69+
exit(err);
70+
}

docs/content/administration/customizing-gitea.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ syntax and shouldn't be touched without fully understanding these components.
284284

285285
Google Analytics, Matomo (previously Piwik), and other analytics services can be added to Gitea. To add the tracking code, refer to the `Other additions to the page` section of this document, and add the JavaScript to the `$GITEA_CUSTOM/templates/custom/header.tmpl` file.
286286

287-
## Customizing gitignores, labels, licenses, locales, and readmes.
287+
## Customizing gitignores, labels, licenses, locales, and readmes
288288

289289
Place custom files in corresponding sub-folder under `custom/options`.
290290

docs/content/administration/https-support.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CERT_FILE = cert.pem
3535
KEY_FILE = key.pem
3636
```
3737

38-
Note that if your certificate is signed by a third party certificate authority (i.e. not self-signed), then cert.pem should contain the certificate chain. The server certificate must be the first entry in cert.pem, followed by the intermediaries in order (if any). The root certificate does not have to be included because the connecting client must already have it in order to estalbish the trust relationship.
38+
Note that if your certificate is signed by a third party certificate authority (i.e. not self-signed), then cert.pem should contain the certificate chain. The server certificate must be the first entry in cert.pem, followed by the intermediaries in order (if any). The root certificate does not have to be included because the connecting client must already have it in order to establish the trust relationship.
3939
To learn more about the config values, please checkout the [Config Cheat Sheet](administration/config-cheat-sheet.md#server-server).
4040

4141
For the `CERT_FILE` or `KEY_FILE` field, the file path is relative to the `GITEA_CUSTOM` environment variable when it is a relative path. It can be an absolute path as well.

docs/content/administration/mail-templates.en-us.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ Please check [Gitea's logs](administration/logging-config.md) for error messages
222222
<a href="{{.Link}}">{{.Repo}}#{{.Issue.Index}}</a>.
223223
</p>
224224
{{if not (eq .Body "")}}
225-
<h3>Message content:</h3>
225+
<h3>Message content</h3>
226226
<hr>
227227
{{.Body | Str2html}}
228228
{{end}}
@@ -245,7 +245,7 @@ This template produces something along these lines:
245245

246246
> [@rhonda](#) (Rhonda Myers) updated [mike/stuff#38](#).
247247
>
248-
> #### Message content:
248+
> #### Message content
249249
>
250250
> \_********************************\_********************************
251251
>

docs/content/administration/mail-templates.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ _主题_ 和 _邮件正文_ 由 [Golang的模板引擎](https://go.dev/pkg/text/
228228

229229
> [@rhonda](#)(Rhonda Myers)更新了 [mike/stuff#38](#)
230230
>
231-
> #### 消息内容
231+
> #### 消息内容
232232
>
233233
> \_********************************\_********************************
234234
>

docs/content/contributing/guidelines-frontend.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The source files can be found in the following directories:
3434

3535
We recommend [Google HTML/CSS Style Guide](https://google.github.io/styleguide/htmlcssguide.html) and [Google JavaScript Style Guide](https://google.github.io/styleguide/jsguide.html)
3636

37-
### Gitea specific guidelines:
37+
### Gitea specific guidelines
3838

3939
1. Every feature (Fomantic-UI/jQuery module) should be put in separate files/directories.
4040
2. HTML ids and classes should use kebab-case, it's preferred to contain 2-3 feature related keywords.

docs/content/contributing/guidelines-frontend.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ HTML 页面由[Go HTML Template](https://pkg.go.dev/html/template)渲染。
3434

3535
我们推荐使用[Google HTML/CSS Style Guide](https://google.github.io/styleguide/htmlcssguide.html)[Google JavaScript Style Guide](https://google.github.io/styleguide/jsguide.html)
3636

37-
## Gitea 特定准则
37+
## Gitea 特定准则
3838

3939
1. 每个功能(Fomantic-UI/jQuery 模块)应放在单独的文件/目录中。
4040
2. HTML 的 id 和 class 应使用 kebab-case,最好包含2-3个与功能相关的关键词。

0 commit comments

Comments
 (0)