Skip to content

Commit c550173

Browse files
authored
Merge branch 'main' into add-file-tree-to-file-view-page
2 parents 0f792a6 + c5422fa commit c550173

File tree

173 files changed

+3710
-1912
lines changed

Some content is hidden

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

173 files changed

+3710
-1912
lines changed

assets/go-licenses.json

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

contrib/fixtures/fixture_generation.go

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

custom/conf/app.example.ini

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,10 @@ LEVEL = Info
784784
;; Please note that setting this to false will not disable OAuth Basic or Basic authentication using a token
785785
;ENABLE_BASIC_AUTHENTICATION = true
786786
;;
787+
;; Show the password sign-in form (for password-based login), otherwise, only show OAuth2 login methods.
788+
;; If you set it to false, maybe it also needs to set ENABLE_BASIC_AUTHENTICATION to false to completely disable password-based authentication.
789+
;ENABLE_PASSWORD_SIGNIN_FORM = true
790+
;;
787791
;; More detail: https://github.com/gogits/gogs/issues/165
788792
;ENABLE_REVERSE_PROXY_AUTHENTICATION = false
789793
; Enable this to allow reverse proxy authentication for API requests, the reverse proxy is responsible for ensuring that no CSRF is possible.
@@ -1944,13 +1948,13 @@ LEVEL = Info
19441948
;; Minio secretAccessKey to connect only available when STORAGE_TYPE is `minio`
19451949
;MINIO_SECRET_ACCESS_KEY =
19461950
;;
1947-
;; Preferred IAM Endpoint to override Minio's default IAM Endpoint resolution only available when STORAGE_TYPE is `minio`.
1948-
;; If not provided and STORAGE_TYPE is `minio`, will search for and derive endpoint from known environment variables
1949-
;; (AWS_CONTAINER_AUTHORIZATION_TOKEN, AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE, AWS_CONTAINER_CREDENTIALS_RELATIVE_URI,
1950-
;; AWS_CONTAINER_CREDENTIALS_FULL_URI, AWS_WEB_IDENTITY_TOKEN_FILE, AWS_ROLE_ARN, AWS_ROLE_SESSION_NAME, AWS_REGION),
1951+
;; Preferred IAM Endpoint to override Minio's default IAM Endpoint resolution only available when STORAGE_TYPE is `minio`.
1952+
;; If not provided and STORAGE_TYPE is `minio`, will search for and derive endpoint from known environment variables
1953+
;; (AWS_CONTAINER_AUTHORIZATION_TOKEN, AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE, AWS_CONTAINER_CREDENTIALS_RELATIVE_URI,
1954+
;; AWS_CONTAINER_CREDENTIALS_FULL_URI, AWS_WEB_IDENTITY_TOKEN_FILE, AWS_ROLE_ARN, AWS_ROLE_SESSION_NAME, AWS_REGION),
19511955
;; or the DefaultIAMRoleEndpoint if not provided otherwise.
19521956
;MINIO_IAM_ENDPOINT =
1953-
;;
1957+
;;
19541958
;; Minio bucket to store the attachments only available when STORAGE_TYPE is `minio`
19551959
;MINIO_BUCKET = gitea
19561960
;;
@@ -2695,10 +2699,10 @@ LEVEL = Info
26952699
;; Minio secretAccessKey to connect only available when STORAGE_TYPE is `minio`
26962700
;MINIO_SECRET_ACCESS_KEY =
26972701
;;
2698-
;; Preferred IAM Endpoint to override Minio's default IAM Endpoint resolution only available when STORAGE_TYPE is `minio`.
2699-
;; If not provided and STORAGE_TYPE is `minio`, will search for and derive endpoint from known environment variables
2700-
;; (AWS_CONTAINER_AUTHORIZATION_TOKEN, AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE, AWS_CONTAINER_CREDENTIALS_RELATIVE_URI,
2701-
;; AWS_CONTAINER_CREDENTIALS_FULL_URI, AWS_WEB_IDENTITY_TOKEN_FILE, AWS_ROLE_ARN, AWS_ROLE_SESSION_NAME, AWS_REGION),
2702+
;; Preferred IAM Endpoint to override Minio's default IAM Endpoint resolution only available when STORAGE_TYPE is `minio`.
2703+
;; If not provided and STORAGE_TYPE is `minio`, will search for and derive endpoint from known environment variables
2704+
;; (AWS_CONTAINER_AUTHORIZATION_TOKEN, AWS_CONTAINER_AUTHORIZATION_TOKEN_FILE, AWS_CONTAINER_CREDENTIALS_RELATIVE_URI,
2705+
;; AWS_CONTAINER_CREDENTIALS_FULL_URI, AWS_WEB_IDENTITY_TOKEN_FILE, AWS_ROLE_ARN, AWS_ROLE_SESSION_NAME, AWS_REGION),
27022706
;; or the DefaultIAMRoleEndpoint if not provided otherwise.
27032707
;MINIO_IAM_ENDPOINT =
27042708
;;

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ require (
114114
github.com/tstranex/u2f v1.0.0
115115
github.com/ulikunitz/xz v0.5.12
116116
github.com/urfave/cli/v2 v2.27.5
117+
github.com/wneessen/go-mail v0.5.2
117118
github.com/xanzy/go-gitlab v0.112.0
118119
github.com/xeipuuv/gojsonschema v1.2.0
119120
github.com/yohcop/openid-go v1.0.1
@@ -130,7 +131,6 @@ require (
130131
golang.org/x/tools v0.26.0
131132
google.golang.org/grpc v1.67.1
132133
google.golang.org/protobuf v1.35.1
133-
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
134134
gopkg.in/ini.v1 v1.67.0
135135
gopkg.in/yaml.v3 v3.0.1
136136
mvdan.cc/xurls/v2 v2.5.0
@@ -319,7 +319,6 @@ require (
319319
golang.org/x/mod v0.21.0 // indirect
320320
golang.org/x/time v0.7.0 // indirect
321321
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
322-
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
323322
gopkg.in/warnings.v0 v0.1.2 // indirect
324323
gopkg.in/yaml.v2 v2.4.0 // indirect
325324
)

0 commit comments

Comments
 (0)