Skip to content

Commit dc3aa48

Browse files
committed
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)
2 parents bf074d2 + 972eae3 commit dc3aa48

Some content is hidden

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

65 files changed

+525
-233
lines changed

.github/ISSUE_TEMPLATE/bug-report.yaml

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

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ contact_links:
77
url: https://discord.gg/Gitea
88
about: Please ask questions and discuss configuration or deployment problems here.
99
- name: Discourse Forum
10-
url: https://discourse.gitea.io
10+
url: https://forum.gitea.com
1111
about: Questions and configuration or deployment problems can also be discussed on our forum.
1212
- name: Frequently Asked Questions
1313
url: https://docs.gitea.com/help/faq

.github/ISSUE_TEMPLATE/feature-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ body:
77
value: |
88
1. Please speak English, this is the language all maintainers can speak and write.
99
2. Please ask questions or configuration/deploy problems on our Discord
10-
server (https://discord.gg/gitea) or forum (https://discourse.gitea.io).
10+
server (https://discord.gg/gitea) or forum (https://forum.gitea.com).
1111
3. Please take a moment to check that your feature hasn't already been suggested.
1212
- type: textarea
1313
id: description

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

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

assets/go-licenses.json

Lines changed: 24 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

custom/conf/app.example.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2713,3 +2713,9 @@ LEVEL = Info
27132713
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
27142714
;; storage type
27152715
;STORAGE_TYPE = local
2716+
2717+
;[global_lock]
2718+
;; Lock service type, could be memory or redis
2719+
;SERVICE_TYPE = memory
2720+
;; Ignored for the "memory" type. For "redis" use something like `redis://127.0.0.1:6379/0`
2721+
;SERVICE_CONN_STR =

go.mod

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ require (
99
codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570
1010
connectrpc.com/connect v1.15.0
1111
gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed
12-
gitea.com/go-chi/cache v0.2.0
12+
gitea.com/go-chi/cache v0.2.1
1313
gitea.com/go-chi/captcha v0.0.0-20240315150714-fb487f629098
1414
gitea.com/go-chi/session v0.0.0-20240316035857-16768d98ec96
1515
gitea.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96
1616
gitea.com/lunny/levelqueue v0.4.2-0.20230414023320-3c0159fe0fe4
17+
github.com/42wim/httpsig v1.2.2
1718
github.com/42wim/sshsig v0.0.0-20211121163825-841cf5bbc121
1819
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.12.0
1920
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2
@@ -45,7 +46,6 @@ require (
4546
github.com/go-chi/cors v1.2.1
4647
github.com/go-co-op/gocron v1.37.0
4748
github.com/go-enry/go-enry/v2 v2.8.8
48-
github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e
4949
github.com/go-git/go-billy/v5 v5.5.0
5050
github.com/go-git/go-git/v5 v5.12.0
5151
github.com/go-ldap/ldap/v3 v3.4.6
@@ -110,12 +110,12 @@ require (
110110
github.com/yuin/goldmark v1.7.2
111111
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc
112112
github.com/yuin/goldmark-meta v1.1.0
113-
golang.org/x/crypto v0.24.0
113+
golang.org/x/crypto v0.26.0
114114
golang.org/x/image v0.18.0
115115
golang.org/x/net v0.26.0
116116
golang.org/x/oauth2 v0.21.0
117-
golang.org/x/sys v0.21.0
118-
golang.org/x/text v0.16.0
117+
golang.org/x/sys v0.23.0
118+
golang.org/x/text v0.17.0
119119
golang.org/x/tools v0.22.0
120120
google.golang.org/grpc v1.62.1
121121
google.golang.org/protobuf v1.34.2
@@ -190,6 +190,7 @@ require (
190190
github.com/go-enry/go-oniguruma v1.2.1 // indirect
191191
github.com/go-faster/city v1.0.1 // indirect
192192
github.com/go-faster/errors v0.7.1 // indirect
193+
github.com/go-fed/httpsig v1.1.1-0.20201223112313-55836744818e // indirect
193194
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
194195
github.com/go-openapi/analysis v0.23.0 // indirect
195196
github.com/go-openapi/errors v0.22.0 // indirect
@@ -300,7 +301,7 @@ require (
300301
go.uber.org/zap v1.27.0 // indirect
301302
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f // indirect
302303
golang.org/x/mod v0.18.0 // indirect
303-
golang.org/x/sync v0.7.0 // indirect
304+
golang.org/x/sync v0.8.0 // indirect
304305
golang.org/x/time v0.5.0 // indirect
305306
google.golang.org/genproto/googleapis/rpc v0.0.0-20240314234333-6e1732d8331c // indirect
306307
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect

0 commit comments

Comments
 (0)