Skip to content

Commit 895fa8b

Browse files
committed
Merge remote-tracking branch 'origin/main' into js-loading
* origin/main: Fix loadOneBranch panic (go-gitea#29938) Fix comment review avatar alignment (go-gitea#29935) Remove the negative margin from `.page-content` (go-gitea#29922) Move notifications to a standalone file (go-gitea#29930) Remove unnecessary ".Link" usages (go-gitea#29929) Remove unnecessary ".Link" usages (go-gitea#29909) Show Actions post step when it's running (go-gitea#29926) Fix the wrong default value of ENABLE_OPENID_SIGNIN on docs (go-gitea#29925) Restore deleted branches when syncing (go-gitea#29898) Don't lock using GitHub actions (go-gitea#29913) Remove jQuery `.attr` from the user search box (go-gitea#29919) Remove jQuery `.attr` from the archive download and compare page branch selector (go-gitea#29918) Remove jQuery `.attr` from the image diff (go-gitea#29917) Remove jQuery `.attr` from the quick pull request button text (go-gitea#29916) Remove jQuery `.attr` from the issue author dropdown (go-gitea#29915) Switch to the maintained vitest extension (go-gitea#29914)
2 parents ded0e13 + 2115147 commit 895fa8b

Some content is hidden

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

45 files changed

+704
-646
lines changed

.github/workflows/cron-lock.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ And the following unique queues:
590590

591591
## OpenID (`openid`)
592592

593-
- `ENABLE_OPENID_SIGNIN`: **false**: Allow authentication in via OpenID.
593+
- `ENABLE_OPENID_SIGNIN`: **true**: Allow authentication in via OpenID.
594594
- `ENABLE_OPENID_SIGNUP`: **! DISABLE\_REGISTRATION**: Allow registering via OpenID.
595595
- `WHITELISTED_URIS`: **_empty_**: If non-empty, list of POSIX regex patterns matching
596596
OpenID URI's to permit.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ Gitea 创建以下非唯一队列:
562562

563563
## OpenID (`openid`)
564564

565-
- `ENABLE_OPENID_SIGNIN`: **false**:允许通过OpenID进行身份验证。
565+
- `ENABLE_OPENID_SIGNIN`: **true**:允许通过OpenID进行身份验证。
566566
- `ENABLE_OPENID_SIGNUP`: **! DISABLE\_REGISTRATION**:允许通过OpenID进行注册。
567567
- `WHITELISTED_URIS`: **_empty_**:如果非空,是一组匹配OpenID URI的POSIX正则表达式模式,用于允许访问。
568568
- `BLACKLISTED_URIS`: **_empty_**:如果非空,是一组匹配OpenID URI的POSIX正则表达式模式,用于阻止访问。

0 commit comments

Comments
 (0)