Merge remote-tracking branch 'giteaofficial/main'

* giteaofficial/main:
  [skip ci] Updated licenses and gitignores
  [skip ci] Updated translations via Crowdin
  Remove SHA1 for support for ssh rsa signing (go-gitea#31857)
  Upgrade cache to v0.2.1 (go-gitea#32003)
  Add automatic light/dark option for the colorblind theme (go-gitea#31997)
  [skip ci] Updated translations via Crowdin
  Use global lock instead of NewExclusivePool to allow distributed lock between multiple Gitea instances (go-gitea#31813)
  Use forum.gitea.com instead of old URL (go-gitea#31989)
  Distinguish official vs non-official reviews, add tool tips, and upgr… (go-gitea#31924)

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -11,7 +11,7 @@ body:
  value: |
  1. Please speak English, this is the language all maintainers can speak and write.
  2. Please ask questions or configuration/deploy problems on our Discord
- server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
+ server (https://discord.gg/gitea) or forum (https://forum.gitea.com).
  3. Make sure you are using the latest release and
  take a moment to check that your issue hasn't been reported before.
  4. Make sure it's not mentioned in the FAQ (https://docs.gitea.com/help/faq)

.github/ISSUE_TEMPLATE/config.yml

@@ -7,7 +7,7 @@ contact_links:
  url: https://discord.gg/Gitea
  about: Please ask questions and discuss configuration or deployment problems here.
  - name: Discourse Forum
- url: https://discourse.gitea.io
+ url: https://forum.gitea.com
  about: Questions and configuration or deployment problems can also be discussed on our forum.
  - name: Frequently Asked Questions
  url: https://docs.gitea.com/help/faq

.github/ISSUE_TEMPLATE/feature-request.yaml

@@ -7,7 +7,7 @@ body:
  value: |
  1. Please speak English, this is the language all maintainers can speak and write.
  2. Please ask questions or configuration/deploy problems on our Discord
- server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
+ server (https://discord.gg/gitea) or forum (https://forum.gitea.com).
  3. Please take a moment to check that your feature hasn't already been suggested.
  - type: textarea
  id: description

.github/ISSUE_TEMPLATE/ui.bug-report.yaml

@@ -11,7 +11,7 @@ body:
  value: |
  1. Please speak English, this is the language all maintainers can speak and write.
  2. Please ask questions or configuration/deploy problems on our Discord
- server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
+ server (https://discord.gg/gitea) or forum (https://forum.gitea.com).
  3. Please take a moment to check that your issue doesn't already exist.
  4. Make sure it's not mentioned in the FAQ (https://docs.gitea.com/help/faq)
  5. Please give all relevant information below for bug reports, because

custom/conf/app.example.ini

@@ -2713,3 +2713,9 @@ LEVEL = Info
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; storage type
 ;STORAGE_TYPE = local
+
+;[global_lock]
+;; Lock service type, could be memory or redis
+;SERVICE_TYPE = memory
+;; Ignored for the "memory" type. For "redis" use something like `redis://127.0.0.1:6379/0`
+;SERVICE_CONN_STR =

go.mod

@@ -9,11 +9,12 @@ require (
  codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570
  connectrpc.com/connect v1.15.0
  gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed
- gitea.com/go-chi/cache v0.2.0
+ gitea.com/go-chi/cache v0.2.1
  gitea.com/go-chi/captcha v0.0.0-20240315150714-fb487f629098
  gitea.com/go-chi/session v0.0.0-20240316035857-16768d98ec96
  gitea.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96
  gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4
+ github.com/42wim/httpsig v1.2.2
  github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121
  github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0
  github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2
@@ -45,7 +46,6 @@ require (
  github.com/go-chi/cors v1.2.1
  github.com/go-co-op/gocron v1.37.0
  github.com/go-enry/go-enry/v2 v2.8.8
- github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e
  github.com/go-git/go-billy/v5 v5.5.0
  github.com/go-git/go-git/v5 v5.12.0
  github.com/go-ldap/ldap/v3 v3.4.6
@@ -110,12 +110,12 @@ require (
  github.com/yuin/goldmark v1.7.2
  github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
  github.com/yuin/goldmark-meta v1.1.0
- golang.org/x/crypto v0.24.0
+ golang.org/x/crypto v0.26.0
  golang.org/x/image v0.18.0
  golang.org/x/net v0.26.0
  golang.org/x/oauth2 v0.21.0
- golang.org/x/sys v0.21.0
- golang.org/x/text v0.16.0
+ golang.org/x/sys v0.23.0
+ golang.org/x/text v0.17.0
  golang.org/x/tools v0.22.0
  google.golang.org/grpc v1.62.1
  google.golang.org/protobuf v1.34.2
@@ -190,6 +190,7 @@ require (
  github.com/go-enry/go-oniguruma v1.2.1 // indirect
  github.com/go-faster/city v1.0.1 // indirect
  github.com/go-faster/errors v0.7.1 // indirect
+ github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e // indirect
  github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
  github.com/go-openapi/analysis v0.23.0 // indirect
  github.com/go-openapi/errors v0.22.0 // indirect
@@ -300,7 +301,7 @@ require (
  go.uber.org/zap v1.27.0 // indirect
  golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f // indirect
  golang.org/x/mod v0.18.0 // indirect
- golang.org/x/sync v0.7.0 // indirect
+ golang.org/x/sync v0.8.0 // indirect
  golang.org/x/time v0.5.0 // indirect
  google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
  gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect