Skip to content

Commit 0c8a155

Browse files
lunnylunny
authored
Merge branch 'main' into lunny/faster_get_comment_from_github
2 parents cf0b1f6 + e8c6cea commit 0c8a155

File tree

443 files changed

+16863
-4915
lines changed

Some content is hidden

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

443 files changed

+16863
-4915
lines changed

‎.drone.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: compliance
44

55
platform:
66
os: linux
7-
arch: arm64
7+
arch: amd64
88

99
trigger:
1010
event:
@@ -27,7 +27,7 @@ steps:
2727

2828
- name: lint-backend
2929
pull: always
30-
image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env
30+
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
3131
commands:
3232
- make lint-backend
3333
environment:
@@ -37,7 +37,7 @@ steps:
3737

3838
- name: lint-backend-windows
3939
pull: always
40-
image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env
40+
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
4141
commands:
4242
- make golangci-lint vet
4343
environment:
@@ -49,7 +49,7 @@ steps:
4949

5050
- name: lint-backend-gogit
5151
pull: always
52-
image: gitea/test_env:linux-arm64 # https://gitea.com/gitea/test-env
52+
image: gitea/test_env:linux-amd64 # https://gitea.com/gitea/test-env
5353
commands:
5454
- make lint-backend
5555
environment:

‎CHANGELOG.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,56 @@ This changelog goes through all the changes that have been made in each release
44
without substantial changes to our git log; to see the highlights of what has
55
been added to each release, please refer to the [blog](https://blog.gitea.io).
66

7+
## [1.14.3](https://github.com/go-gitea/gitea/releases/tag/v1.14.3) - 2021-06-18
8+
9+
* SECURITY
10+
* Encrypt migration credentials at rest (#15895) (#16187)
11+
* Only check access tokens if they are likely to be tokens (#16164) (#16171)
12+
* Add missing SameSite settings for the i_like_gitea cookie (#16037) (#16039)
13+
* Fix setting of SameSite on cookies (#15989) (#15991)
14+
* API
15+
* Repository object only count releases as releases (#16184) (#16190)
16+
* EditOrg respect RepoAdminChangeTeamAccess option (#16184) (#16190)
17+
* Fix overly strict edit pr permissions (#15900) (#16081)
18+
* BUGFIXES
19+
* Run processors on whole of text (#16155) (#16185)
20+
* Class `issue-keyword` is being incorrectly stripped off spans (#16163) (#16172)
21+
* Fix language switch for install page (#16043) (#16128)
22+
* Fix bug on getIssueIDsByRepoID (#16119) (#16124)
23+
* Set self-adjusting deadline for connection writing (#16068) (#16123)
24+
* Fix http path bug (#16117) (#16120)
25+
* Fix data URI scramble (#16098) (#16118)
26+
* Merge all deleteBranch as one function and also fix bug when delete branch don't close related PRs (#16067) (#16097)
27+
* git migration: don't prompt interactively for clone credentials (#15902) (#16082)
28+
* Fix case change in ownernames (#16045) (#16050)
29+
* Don't manipulate input params in email notification (#16011) (#16033)
30+
* Remove branch URL before IssueRefURL (#15968) (#15970)
31+
* Fix layout of milestone view (#15927) (#15940)
32+
* GitHub Migration, migrate draft releases too (#15884) (#15888)
33+
* Close the gitrepo when deleting the repository (#15876) (#15887)
34+
* Upgrade xorm to v1.1.0 (#15869) (#15885)
35+
* Fix blame row height alignment (#15863) (#15883)
36+
* Fix error message when saving generated LOCAL_ROOT_URL config (#15880) (#15882)
37+
* Backport Fix LFS commit finder not working (#15856) (#15874)
38+
* Stop calling WriteHeader in Write (#15862) (#15873)
39+
* Add timeout to writing to responses (#15831) (#15872)
40+
* Return go-get info on subdirs (#15642) (#15871)
41+
* Restore PAM user autocreation functionality (#15825) (#15867)
42+
* Fix truncate utf8 string (#15828) (#15854)
43+
* Fix bound address/port for caddy's certmagic library (#15758) (#15848)
44+
* Upgrade unrolled/render to v1.1.1 (#15845) (#15846)
45+
* Queue manager FlushAll can loop rapidly - add delay (#15733) (#15840)
46+
* Tagger can be empty, as can Commit and Author - tolerate this (#15835) (#15839)
47+
* Set autocomplete off on branches selector (#15809) (#15833)
48+
* Add missing error to Doctor log (#15813) (#15824)
49+
* Move restore repo to internal router and invoke from command to avoid open the same db file or queues files (#15790) (#15816)
50+
* ENHANCEMENTS
51+
* Removable media support to snap package (#16136) (#16138)
52+
* Move sans-serif fallback font higher than emoji fonts (#15855) (#15892)
53+
* DOCKER
54+
* Only write config in environment-to-ini if there are changes (#15861) (#15868)
55+
* Only offer hostcertificates if they exist (#15849) (#15853)
56+
757
## [1.14.2](https://github.com/go-gitea/gitea/releases/tag/v1.14.2) - 2021-05-09
858

959
* API

‎MAINTAINERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@ Norwin Roosen <[email protected]> (@noerw)
4242
Kyle Dumont <[email protected]> (@kdumontnu)
4343
Patrick Schratz <[email protected]> (@pat-s)
4444
Janis Estelmann <[email protected]> (@KN4CK3R)
45+
Steven Kriegler <[email protected]> (@justusbunsi)
46+
Jimmy Praet <[email protected]> (@jpraet)

‎cmd/convert.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ func runConvert(ctx *cli.Context) error {
2727
return err
2828
}
2929

30-
log.Trace("AppPath: %s", setting.AppPath)
31-
log.Trace("AppWorkPath: %s", setting.AppWorkPath)
32-
log.Trace("Custom path: %s", setting.CustomPath)
33-
log.Trace("Log path: %s", setting.LogRootPath)
30+
log.Info("AppPath: %s", setting.AppPath)
31+
log.Info("AppWorkPath: %s", setting.AppWorkPath)
32+
log.Info("Custom path: %s", setting.CustomPath)
33+
log.Info("Log path: %s", setting.LogRootPath)
3434
setting.InitDBConfig()
3535

3636
if !setting.Database.UseMySQL {

‎cmd/dump_repo.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ var CmdDumpRepository = cli.Command{
6969
cli.StringFlag{
7070
Name: "units",
7171
Value: "",
72-
Usage: `Which items will be migrated, one or more units should be separated as comma.
72+
Usage: `Which items will be migrated, one or more units should be separated as comma.
7373
wiki, issues, labels, releases, release_assets, milestones, pull_requests, comments are allowed. Empty means all units.`,
7474
},
7575
},
@@ -80,10 +80,10 @@ func runDumpRepository(ctx *cli.Context) error {
8080
return err
8181
}
8282

83-
log.Trace("AppPath: %s", setting.AppPath)
84-
log.Trace("AppWorkPath: %s", setting.AppWorkPath)
85-
log.Trace("Custom path: %s", setting.CustomPath)
86-
log.Trace("Log path: %s", setting.LogRootPath)
83+
log.Info("AppPath: %s", setting.AppPath)
84+
log.Info("AppWorkPath: %s", setting.AppWorkPath)
85+
log.Info("Custom path: %s", setting.CustomPath)
86+
log.Info("Log path: %s", setting.LogRootPath)
8787
setting.InitDBConfig()
8888

8989
var (

‎cmd/generate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func runGenerateInternalToken(c *cli.Context) error {
7171
}
7272

7373
func runGenerateLfsJwtSecret(c *cli.Context) error {
74-
JWTSecretBase64, err := generate.NewJwtSecret()
74+
JWTSecretBase64, err := generate.NewJwtSecretBase64()
7575
if err != nil {
7676
return err
7777
}

‎cmd/hook.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Gitea or set your environment appropriately.`, "")
179179
GitObjectDirectory: os.Getenv(private.GitObjectDirectory),
180180
GitQuarantinePath: os.Getenv(private.GitQuarantinePath),
181181
GitPushOptions: pushOptions(),
182-
ProtectedBranchID: prID,
182+
PullRequestID: prID,
183183
IsDeployKey: isDeployKey,
184184
}
185185

@@ -221,16 +221,16 @@ Gitea or set your environment appropriately.`, "")
221221
total++
222222
lastline++
223223

224-
// If the ref is a branch, check if it's protected
225-
if strings.HasPrefix(refFullName, git.BranchPrefix) {
224+
// If the ref is a branch or tag, check if it's protected
225+
if strings.HasPrefix(refFullName, git.BranchPrefix) || strings.HasPrefix(refFullName, git.TagPrefix) {
226226
oldCommitIDs[count] = oldCommitID
227227
newCommitIDs[count] = newCommitID
228228
refFullNames[count] = refFullName
229229
count++
230230
fmt.Fprintf(out, "*")
231231

232232
if count >= hookBatchSize {
233-
fmt.Fprintf(out, " Checking %d branches\n", count)
233+
fmt.Fprintf(out, " Checking %d references\n", count)
234234

235235
hookOptions.OldCommitIDs = oldCommitIDs
236236
hookOptions.NewCommitIDs = newCommitIDs
@@ -261,7 +261,7 @@ Gitea or set your environment appropriately.`, "")
261261
hookOptions.NewCommitIDs = newCommitIDs[:count]
262262
hookOptions.RefFullNames = refFullNames[:count]
263263

264-
fmt.Fprintf(out, " Checking %d branches\n", count)
264+
fmt.Fprintf(out, " Checking %d references\n", count)
265265

266266
statusCode, msg := private.HookPreReceive(username, reponame, hookOptions)
267267
switch statusCode {

‎cmd/migrate.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ func runMigrate(ctx *cli.Context) error {
2828
return err
2929
}
3030

31-
log.Trace("AppPath: %s", setting.AppPath)
32-
log.Trace("AppWorkPath: %s", setting.AppWorkPath)
33-
log.Trace("Custom path: %s", setting.CustomPath)
34-
log.Trace("Log path: %s", setting.LogRootPath)
31+
log.Info("AppPath: %s", setting.AppPath)
32+
log.Info("AppWorkPath: %s", setting.AppWorkPath)
33+
log.Info("Custom path: %s", setting.CustomPath)
34+
log.Info("Log path: %s", setting.LogRootPath)
3535
setting.InitDBConfig()
3636

3737
if err := models.NewEngine(context.Background(), migrations.Migrate); err != nil {

‎cmd/migrate_storage.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ func runMigrateStorage(ctx *cli.Context) error {
110110
return err
111111
}
112112

113-
log.Trace("AppPath: %s", setting.AppPath)
114-
log.Trace("AppWorkPath: %s", setting.AppWorkPath)
115-
log.Trace("Custom path: %s", setting.CustomPath)
116-
log.Trace("Log path: %s", setting.LogRootPath)
113+
log.Info("AppPath: %s", setting.AppPath)
114+
log.Info("AppWorkPath: %s", setting.AppWorkPath)
115+
log.Info("Custom path: %s", setting.CustomPath)
116+
log.Info("Log path: %s", setting.LogRootPath)
117117
setting.InitDBConfig()
118118

119119
if err := models.NewEngine(context.Background(), migrations.Migrate); err != nil {

‎cmd/web.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ and it takes care of all the other things for you`,
4747
Value: setting.PIDFile,
4848
Usage: "Custom pid file path",
4949
},
50+
cli.BoolFlag{
51+
Name: "quiet, q",
52+
Usage: "Only display Fatal logging errors until logging is set-up",
53+
},
54+
cli.BoolFlag{
55+
Name: "verbose",
56+
Usage: "Set initial logging to TRACE level until logging is properly set-up",
57+
},
5058
},
5159
}
5260

@@ -71,6 +79,14 @@ func runHTTPRedirector() {
7179
}
7280

7381
func runWeb(ctx *cli.Context) error {
82+
if ctx.Bool("verbose") {
83+
_ = log.DelLogger("console")
84+
log.NewLogger(0, "console", "console", fmt.Sprintf(`{"level": "trace", "colorize": %t, "stacktraceLevel": "none"}`, log.CanColorStdout))
85+
} else if ctx.Bool("quiet") {
86+
_ = log.DelLogger("console")
87+
log.NewLogger(0, "console", "console", fmt.Sprintf(`{"level": "fatal", "colorize": %t, "stacktraceLevel": "none"}`, log.CanColorStdout))
88+
}
89+
7490
managerCtx, cancel := context.WithCancel(context.Background())
7591
graceful.InitManager(managerCtx)
7692
defer cancel()

‎contrib/pr/checkout.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"time"
2727

2828
"code.gitea.io/gitea/models"
29+
gitea_git "code.gitea.io/gitea/modules/git"
2930
"code.gitea.io/gitea/modules/markup"
3031
"code.gitea.io/gitea/modules/markup/external"
3132
"code.gitea.io/gitea/modules/setting"
@@ -79,7 +80,7 @@ func runPR() {
7980
setting.RunUser = curUser.Username
8081

8182
log.Printf("[PR] Loading fixtures data ...\n")
82-
setting.CheckLFSVersion()
83+
gitea_git.CheckLFSVersion()
8384
//models.LoadConfigs()
8485
/*
8586
setting.Database.Type = "sqlite3"

‎custom/conf/app.example.ini

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,17 @@ INTERNAL_TOKEN=
388388
;; Enables OAuth2 provider
389389
ENABLE = true
390390
;;
391+
;; Algorithm used to sign OAuth2 tokens. Valid values: HS256, HS384, HS512, RS256, RS384, RS512, ES256, ES384, ES512
392+
;JWT_SIGNING_ALGORITHM = RS256
393+
;;
394+
;; Private key file path used to sign OAuth2 tokens. The path is relative to APP_DATA_PATH.
395+
;; This setting is only needed if JWT_SIGNING_ALGORITHM is set to RS256, RS384, RS512, ES256, ES384 or ES512.
396+
;; The file must contain a RSA or ECDSA private key in the PKCS8 format. If no key exists a 4096 bit key will be created for you.
397+
;JWT_SIGNING_PRIVATE_KEY_FILE = jwt/private.pem
398+
;;
391399
;; OAuth2 authentication secret for access and refresh tokens, change this yourself to a unique string. CLI generate option is helpful in this case. https://docs.gitea.io/en-us/command-line/#generate
392-
JWT_SECRET =
400+
;; This setting is only needed if JWT_SIGNING_ALGORITHM is set to HS256, HS384 or HS512.
401+
;JWT_SECRET =
393402
;;
394403
;; Lifetime of an OAuth2 access token in seconds
395404
;ACCESS_TOKEN_EXPIRATION_TIME = 3600
@@ -642,9 +651,18 @@ PATH =
642651
;DEFAULT_ALLOW_CREATE_ORGANIZATION = true
643652
;;
644653
;; Either "public", "limited" or "private", default is "public"
645-
;; Limited is for signed user only
646-
;; Private is only for member of the organization
647-
;; Public is for everyone
654+
;; Limited is for users visible only to signed users
655+
;; Private is for users visible only to members of their organizations
656+
;; Public is for users visible for everyone
657+
;DEFAULT_USER_VISIBILITY = public
658+
;;
659+
;; Set whitch visibibilty modes a user can have
660+
;ALLOWED_USER_VISIBILITY_MODES = public,limited,private
661+
;;
662+
;; Either "public", "limited" or "private", default is "public"
663+
;; Limited is for organizations visible only to signed users
664+
;; Private is for organizations visible only to members of the organization
665+
;; Public is for organizations visible to everyone
648666
;DEFAULT_ORG_VISIBILITY = public
649667
;;
650668
;; Default value for DefaultOrgMemberVisible
@@ -696,6 +714,8 @@ PATH =
696714
;;
697715
;; Minimum amount of time a user must exist before comments are kept when the user is deleted.
698716
;USER_DELETE_WITH_COMMENTS_MAX_TIME = 0
717+
;; Valid site url schemes for user profiles
718+
;VALID_SITE_URL_SCHEMES=http,https
699719

700720

701721
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1009,11 +1029,16 @@ PATH =
10091029
;; All available themes. Allow users select personalized themes regardless of the value of `DEFAULT_THEME`.
10101030
;THEMES = gitea,arc-green
10111031
;;
1012-
;;All available reactions users can choose on issues/prs and comments.
1013-
;;Values can be emoji alias (:smile:) or a unicode emoji.
1014-
;;For custom reactions, add a tightly cropped square image to public/emoji/img/reaction_name.png
1032+
;; All available reactions users can choose on issues/prs and comments.
1033+
;; Values can be emoji alias (:smile:) or a unicode emoji.
1034+
;; For custom reactions, add a tightly cropped square image to public/img/emoji/reaction_name.png
10151035
;REACTIONS = +1, -1, laugh, hooray, confused, heart, rocket, eyes
10161036
;;
1037+
;; Additional Emojis not defined in the utf8 standard
1038+
;; By default we support gitea (:gitea:), to add more copy them to public/img/emoji/emoji_name.png and add it to this config.
1039+
;; Dont mistake it for Reactions.
1040+
;CUSTOM_EMOJIS = gitea
1041+
;;
10171042
;; Whether the full name of the users should be shown where possible. If the full name isn't set, the username will be used.
10181043
;DEFAULT_SHOW_FULL_NAME = false
10191044
;;
@@ -1155,20 +1180,20 @@ PATH =
11551180
;STARTUP_TIMEOUT = 30s
11561181
;;
11571182
;; Issue indexer queue, currently support: channel, levelqueue or redis, default is levelqueue (deprecated - use [queue.issue_indexer])
1158-
;ISSUE_INDEXER_QUEUE_TYPE = levelqueue
1183+
;ISSUE_INDEXER_QUEUE_TYPE = levelqueue; **DEPRECATED** use settings in `[queue.issue_indexer]`.
11591184
;;
11601185
;; When ISSUE_INDEXER_QUEUE_TYPE is levelqueue, this will be the path where the queue will be saved.
11611186
;; This can be overridden by `ISSUE_INDEXER_QUEUE_CONN_STR`.
11621187
;; default is queues/common
1163-
;ISSUE_INDEXER_QUEUE_DIR = queues/common
1188+
;ISSUE_INDEXER_QUEUE_DIR = queues/common; **DEPRECATED** use settings in `[queue.issue_indexer]`.
11641189
;;
11651190
;; When `ISSUE_INDEXER_QUEUE_TYPE` is `redis`, this will store the redis connection string.
11661191
;; When `ISSUE_INDEXER_QUEUE_TYPE` is `levelqueue`, this is a directory or additional options of
11671192
;; the form `leveldb://path/to/db?option=value&....`, and overrides `ISSUE_INDEXER_QUEUE_DIR`.
1168-
;ISSUE_INDEXER_QUEUE_CONN_STR = "addrs=127.0.0.1:6379 db=0"
1193+
;ISSUE_INDEXER_QUEUE_CONN_STR = "addrs=127.0.0.1:6379 db=0"; **DEPRECATED** use settings in `[queue.issue_indexer]`.
11691194
;;
11701195
;; Batch queue number, default is 20
1171-
;ISSUE_INDEXER_QUEUE_BATCH_NUMBER = 20
1196+
;ISSUE_INDEXER_QUEUE_BATCH_NUMBER = 20; **DEPRECATED** use settings in `[queue.issue_indexer]`.
11721197

11731198
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
11741199
;; Repository Indexer settings
@@ -1197,7 +1222,7 @@ PATH =
11971222
;REPO_INDEXER_EXCLUDE =
11981223
;;
11991224
;;
1200-
;UPDATE_BUFFER_LEN = 20
1225+
;UPDATE_BUFFER_LEN = 20; **DEPRECATED** use settings in `[queue.issue_indexer]`.
12011226
;MAX_FILE_SIZE = 1048576
12021227

12031228
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -1387,8 +1412,8 @@ PATH =
13871412
;; Mail server
13881413
;; Gmail: smtp.gmail.com:587
13891414
;; QQ: smtp.qq.com:465
1390-
;; Using STARTTLS on port 587 is recommended per RFC 6409.
1391-
;; Note, if the port ends with "465", SMTPS will be used.
1415+
;; As per RFC 8314 using Implicit TLS/SMTPS on port 465 (if supported) is recommended,
1416+
;; otherwise STARTTLS on port 587 should be used.
13921417
;HOST =
13931418
;;
13941419
;; Disable HELO operation when hostnames are different.
@@ -2039,6 +2064,16 @@ PATH =
20392064
;; storage type
20402065
;STORAGE_TYPE = local
20412066

2067+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2068+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2069+
;; settings for repository archives, will override storage setting
2070+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2071+
;[storage.repo-archive]
2072+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2073+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
2074+
;; storage type
2075+
;STORAGE_TYPE = local
2076+
20422077
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
20432078
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
20442079
;; lfs storage will override storage

0 commit comments

Comments
 (0)