Skip to content

Commit 85e30e2

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: (26 commits) Refactor docs (go-gitea#23752) Fix layouts of admin table / adapt repo / email test (go-gitea#24370) Move secrets and runners settings to actions settings (go-gitea#24200) Gitea Actions add `base_ref`, `head_ref`, `api_url`, `ref_type` fields (go-gitea#24356) Fix auth check bug (go-gitea#24382) Display 'Unknown' when runner.version is empty (go-gitea#24378) Fix incorrect last online time in runner_edit.tmpl (go-gitea#24376) Refactor "route" related code, fix Safari cookie bug (go-gitea#24330) Add custom helm repo name generated from url (go-gitea#24363) Add API for gitignore templates (go-gitea#22783) Add eslint-plugin-regexp (go-gitea#24361) Support uploading file to empty repo by API (go-gitea#24357) [skip ci] Updated translations via Crowdin Require repo scope for PATs for private repos and basic authentication (go-gitea#24362) Alert error message if open dependencies are included in the issues that try to batch close (go-gitea#24329) Fix 404 error when leaving the last private org team (go-gitea#24322) Modify width of ui container, fine tune css for settings pages and org header (go-gitea#24315) Add .livemd as a markdown extension (go-gitea#22730) Display when a repo was archived (go-gitea#22664) Fix wrong error info in RepoRefForAPI (go-gitea#24344) ...
2 parents 3be44b5 + bb25f85 commit 85e30e2

File tree

287 files changed

+2152
-1100
lines changed

Some content is hidden

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

287 files changed

+2152
-1100
lines changed

.eslintrc.yaml

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ plugins:
1515
- eslint-plugin-no-jquery
1616
- eslint-plugin-sonarjs
1717
- eslint-plugin-custom-elements
18+
- eslint-plugin-regexp
1819

1920
env:
2021
es2022: true
@@ -472,6 +473,80 @@ rules:
472473
quote-props: [0]
473474
quotes: [2, single, {avoidEscape: true, allowTemplateLiterals: true}]
474475
radix: [2, as-needed]
476+
regexp/confusing-quantifier: [2]
477+
regexp/control-character-escape: [2]
478+
regexp/hexadecimal-escape: [0]
479+
regexp/letter-case: [0]
480+
regexp/match-any: [2]
481+
regexp/negation: [2]
482+
regexp/no-contradiction-with-assertion: [0]
483+
regexp/no-control-character: [0]
484+
regexp/no-dupe-characters-character-class: [2]
485+
regexp/no-dupe-disjunctions: [2]
486+
regexp/no-empty-alternative: [2]
487+
regexp/no-empty-capturing-group: [2]
488+
regexp/no-empty-character-class: [0]
489+
regexp/no-empty-group: [2]
490+
regexp/no-empty-lookarounds-assertion: [2]
491+
regexp/no-escape-backspace: [2]
492+
regexp/no-extra-lookaround-assertions: [0]
493+
regexp/no-invalid-regexp: [2]
494+
regexp/no-invisible-character: [2]
495+
regexp/no-lazy-ends: [2]
496+
regexp/no-legacy-features: [2]
497+
regexp/no-misleading-capturing-group: [0]
498+
regexp/no-misleading-unicode-character: [0]
499+
regexp/no-missing-g-flag: [2]
500+
regexp/no-non-standard-flag: [2]
501+
regexp/no-obscure-range: [2]
502+
regexp/no-octal: [2]
503+
regexp/no-optional-assertion: [2]
504+
regexp/no-potentially-useless-backreference: [2]
505+
regexp/no-standalone-backslash: [2]
506+
regexp/no-super-linear-backtracking: [0]
507+
regexp/no-super-linear-move: [0]
508+
regexp/no-trivially-nested-assertion: [2]
509+
regexp/no-trivially-nested-quantifier: [2]
510+
regexp/no-unused-capturing-group: [0]
511+
regexp/no-useless-assertions: [2]
512+
regexp/no-useless-backreference: [2]
513+
regexp/no-useless-character-class: [2]
514+
regexp/no-useless-dollar-replacements: [2]
515+
regexp/no-useless-escape: [2]
516+
regexp/no-useless-flag: [2]
517+
regexp/no-useless-lazy: [2]
518+
regexp/no-useless-non-capturing-group: [2]
519+
regexp/no-useless-quantifier: [2]
520+
regexp/no-useless-range: [2]
521+
regexp/no-useless-two-nums-quantifier: [2]
522+
regexp/no-zero-quantifier: [2]
523+
regexp/optimal-lookaround-quantifier: [2]
524+
regexp/optimal-quantifier-concatenation: [0]
525+
regexp/prefer-character-class: [0]
526+
regexp/prefer-d: [0]
527+
regexp/prefer-escape-replacement-dollar-char: [0]
528+
regexp/prefer-lookaround: [0]
529+
regexp/prefer-named-backreference: [0]
530+
regexp/prefer-named-capture-group: [0]
531+
regexp/prefer-named-replacement: [0]
532+
regexp/prefer-plus-quantifier: [2]
533+
regexp/prefer-predefined-assertion: [2]
534+
regexp/prefer-quantifier: [0]
535+
regexp/prefer-question-quantifier: [2]
536+
regexp/prefer-range: [2]
537+
regexp/prefer-regexp-exec: [2]
538+
regexp/prefer-regexp-test: [2]
539+
regexp/prefer-result-array-groups: [0]
540+
regexp/prefer-star-quantifier: [2]
541+
regexp/prefer-unicode-codepoint-escapes: [2]
542+
regexp/prefer-w: [0]
543+
regexp/require-unicode-regexp: [0]
544+
regexp/sort-alternatives: [0]
545+
regexp/sort-character-class-elements: [0]
546+
regexp/sort-flags: [0]
547+
regexp/strict: [2]
548+
regexp/unicode-escape: [0]
549+
regexp/use-ignore-case: [0]
475550
require-atomic-updates: [0]
476551
require-await: [0]
477552
require-unicode-regexp: [0]

custom/conf/app.example.ini

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ ROUTER = console
992992
;;
993993
;; List of file extensions for which lines should be wrapped in the Monaco editor
994994
;; Separate extensions with a comma. To line wrap files without an extension, just put a comma
995-
;LINE_WRAP_EXTENSIONS = .txt,.md,.markdown,.mdown,.mkd,
995+
;LINE_WRAP_EXTENSIONS = .txt,.md,.markdown,.mdown,.mkd,.livemd,
996996

997997
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
998998
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1203,10 +1203,9 @@ ROUTER = console
12031203
;; Number of line of codes shown for a code comment
12041204
;CODE_COMMENT_LINES = 4
12051205
;;
1206-
;; Value of `theme-color` meta tag, used by Android >= 5.0
1207-
;; An invalid color like "none" or "disable" will have the default style
1208-
;; More info: https://developers.google.com/web/updates/2014/11/Support-for-theme-color-in-Chrome-39-for-Android
1209-
;THEME_COLOR_META_TAG = `#6cc644`
1206+
;; Value of `theme-color` meta tag, used by some mobile browers for chrome and
1207+
;; out-of-viewport areas. Default is unset which uses body color.
1208+
;THEME_COLOR_META_TAG =
12101209
;;
12111210
;; Max size of files to be displayed (default is 8MiB)
12121211
;MAX_DISPLAY_FILE_SIZE = 8388608
@@ -1335,7 +1334,7 @@ ROUTER = console
13351334
;;
13361335
;; List of file extensions that should be rendered/edited as Markdown
13371336
;; Separate the extensions with a comma. To render files without any extension as markdown, just put a comma
1338-
;FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd
1337+
;FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd,.livemd
13391338
;;
13401339
;; Enables math inline and block detection
13411340
;ENABLE_MATH = true

docs/assets/js/search.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ function populateResults(result) {
138138

139139
function render(templateString, data) {
140140
let conditionalMatches, copy;
141-
const conditionalPattern = /\$\{\s*isset ([a-zA-Z]*) \s*\}(.*)\$\{\s*end\s*}/g;
142-
// since loop below depends on re.lastInxdex, we use a copy to capture any manipulations whilst inside the loop
141+
const conditionalPattern = /\$\{\s*isset ([a-zA-Z]*) \s*\}(.*)\$\{\s*end\s*\}/g;
142+
// since loop below depends on re.lastIndex, we use a copy to capture any manipulations whilst inside the loop
143143
copy = templateString;
144144
while ((conditionalMatches = conditionalPattern.exec(templateString)) !== null) {
145145
if (data[conditionalMatches[1]]) {

docs/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ enableEmoji: true
1010

1111
permalinks:
1212
post: /:year/:month/:title/
13-
doc: /:slug/
13+
doc: /:sections[1:]/:slug/
1414
page: /:slug/
1515
default: /:slug/
1616

docs/content/doc/administration/_index.en-us.md

Whitespace-only changes.

docs/content/doc/administration/_index.zh-cn.md

Whitespace-only changes.

docs/content/doc/administration/_index.zh-tw.md

Whitespace-only changes.

docs/content/doc/administration/adding-legal-pages.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: adding-legal-pages
55
weight: 110
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/adding-legal-pages
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/backup-and-restore.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "backup-and-restore"
55
weight: 11
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/backup-and-restore
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/backup-and-restore.zh-cn.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "backup-and-restore"
55
weight: 11
66
toc: false
77
draft: false
8+
aliases:
9+
- /zh-cn/backup-and-restore
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/backup-and-restore.zh-tw.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "backup-and-restore"
55
weight: 11
66
toc: false
77
draft: false
8+
aliases:
9+
- /zh-tw/backup-and-restore
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/cmd-embedded.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "cmd-embedded"
55
weight: 20
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/cmd-embedded
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/command-line.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "command-line"
55
weight: 1
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/command-line
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/config-cheat-sheet.en-us.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "config-cheat-sheet"
55
weight: 30
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/config-cheat-sheet
810
menu:
911
sidebar:
1012
parent: "administration"
@@ -117,7 +119,7 @@ In addition there is _`StaticRootPath`_ which can be set as a built-in at build
117119

118120
### Repository - Editor (`repository.editor`)
119121

120-
- `LINE_WRAP_EXTENSIONS`: **.txt,.md,.markdown,.mdown,.mkd,**: List of file extensions for which lines should be wrapped in the Monaco editor. Separate extensions with a comma. To line wrap files without an extension, just put a comma
122+
- `LINE_WRAP_EXTENSIONS`: **.txt,.md,.markdown,.mdown,.mkd,.livemd,**: List of file extensions for which lines should be wrapped in the Monaco editor. Separate extensions with a comma. To line wrap files without an extension, just put a comma
121123
- `PREVIEWABLE_FILE_MODES`: **markdown**: Valid file modes that have a preview API associated with them, such as `api/v1/markdown`. Separate the values by commas. The preview tab in edit mode won't be displayed if the file extension doesn't match.
122124

123125
### Repository - Pull Request (`repository.pull-request`)
@@ -220,7 +222,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
220222
- `SHOW_USER_EMAIL`: **true**: Whether the email of the user should be shown in the Explore Users page.
221223
- `THEMES`: **auto,gitea,arc-green**: All available themes. Allow users select personalized themes.
222224
regardless of the value of `DEFAULT_THEME`.
223-
- `THEME_COLOR_META_TAG`: **#6cc644**: Value of `theme-color` meta tag, used by Android >= 5.0. An invalid color like "none" or "disable" will have the default style. More info: https://developers.google.com/web/updates/2014/11/Support-for-theme-color-in-Chrome-39-for-Android
225+
- `THEME_COLOR_META_TAG`: **\<empty\>**: Value of `theme-color` meta tag, used by some mobile browers for chrome and out-of-viewport areas. Default is unset which uses body color.
224226
- `MAX_DISPLAY_FILE_SIZE`: **8388608**: Max size of files to be displayed (default is 8MiB)
225227
- `REACTIONS`: All available reactions users can choose on issues/prs and comments
226228
Values can be emoji alias (:smile:) or a unicode emoji.
@@ -277,6 +279,7 @@ The following configuration set `Content-Type: application/vnd.android.package-a
277279
- `CUSTOM_URL_SCHEMES`: Use a comma separated list (ftp,git,svn) to indicate additional
278280
URL hyperlinks to be rendered in Markdown. URLs beginning in http and https are
279281
always displayed
282+
- `FILE_EXTENSIONS`: **.md,.markdown,.mdown,.mkd,.livemd**: List of file extensions that should be rendered/edited as Markdown. Separate the extensions with a comma. To render files without any extension as markdown, just put a comma.
280283
- `ENABLE_MATH`: **true**: Enables detection of `\(...\)`, `\[...\]`, `$...$` and `$$...$$` blocks as math blocks.
281284

282285
## Server (`server`)

docs/content/doc/administration/config-cheat-sheet.zh-cn.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "config-cheat-sheet"
55
weight: 30
66
toc: false
77
draft: false
8+
aliases:
9+
- /zh-cn/config-cheat-sheet
810
menu:
911
sidebar:
1012
parent: "administration"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "customizing-gitea"
55
weight: 100
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/customizing-gitea
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/customizing-gitea.zh-cn.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "customizing-gitea"
55
weight: 100
66
toc: false
77
draft: false
8+
aliases:
9+
- /zh-cn/customizing-gitea
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/email-setup.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "email-setup"
55
weight: 12
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/email-setup
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/environment-variables.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "environment-variables"
55
weight: 10
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/environment-variables
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/environment-variables.zh-cn.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "environment-variables"
55
weight: 10
66
toc: false
77
draft: false
8+
aliases:
9+
- /zh-cn/environment-variables
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/external-renderers.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "external-renderers"
55
weight: 60
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/external-renderers
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/fail2ban-setup.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "fail2ban-setup"
55
weight: 16
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/fail2ban-setup
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/fail2ban-setup.zh-cn.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "fail2ban-setup"
55
weight: 16
66
toc: false
77
draft: false
8+
aliases:
9+
- /zh-cn/fail2ban-setup
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/git-lfs-support.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "git-lfs-setup"
55
weight: 12
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/git-lfs-setup
810
menu:
911
sidebar:
1012
parent: "administration"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "https-setup"
55
weight: 12
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/https-setup
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/logging-documentation.en-us.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "logging-configuration"
55
weight: 40
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/logging-configuration
810
menu:
911
sidebar:
1012
parent: "administration"
@@ -29,7 +31,7 @@ As mentioned below, there is a fully functional log output by default, so it is
2931

3032
## Collecting Logs for Help
3133

32-
To collect logs for help and issue report, see [Support Options]({{< relref "doc/help/seek-help.en-us.md" >}}).
34+
To collect logs for help and issue report, see [Support Options]({{< relref "doc/help/support.en-us.md" >}}).
3335

3436
## The `[log]` section
3537

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "mail-templates"
55
weight: 45
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/mail-templates
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/repo-indexer.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "repo-indexer"
55
weight: 45
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/repo-indexer
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/reverse-proxies.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "reverse-proxies"
55
weight: 16
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/reverse-proxies
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/reverse-proxies.zh-cn.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "reverse-proxies"
55
weight: 16
66
toc: false
77
draft: false
8+
aliases:
9+
- /zh-cn/reverse-proxies
810
menu:
911
sidebar:
1012
parent: "administration"

docs/content/doc/administration/search-engines-indexation.en-us.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ slug: "search-engines-indexation"
55
weight: 60
66
toc: false
77
draft: false
8+
aliases:
9+
- /en-us/search-engines-indexation
810
menu:
911
sidebar:
1012
parent: "administration"

0 commit comments

Comments
 (0)