Skip to content

Commit 0261a67

Browse files
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Use random bytes to generate access token (go-gitea#21959) Replace fmt.Sprintf with hex.EncodeToString (go-gitea#21960) Implement FSFE REUSE for golang files (go-gitea#21840) Correct the fallbacks for mailer configuration (go-gitea#21945) [skip ci] Updated licenses and gitignores Fix typos (go-gitea#21947) Fix markdown anchor re-clicking (go-gitea#21931) Prevent NPE if trying to restore an already restored deleted branch (go-gitea#21940) add rel="me" to org.website link (go-gitea#21941)
2 parents c7939bb + f047ee0 commit 0261a67

File tree

1,879 files changed

+2064
-3886
lines changed

Some content is hidden

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

1,879 files changed

+2064
-3886
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions

build.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2020 The Gitea Authors. All rights reserved.
2-
// Use of this source code is governed by a MIT-style
3-
// license that can be found in the LICENSE file.
2+
// SPDX-License-Identifier: MIT
3+
44

55
//go:build vendor
66

build/code-batch-process.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright 2021 The Gitea Authors. All rights reserved.
2-
// Use of this source code is governed by a MIT-style
3-
// license that can be found in the LICENSE file.
2+
// SPDX-License-Identifier: MIT
43

54
//go:build ignore
65

build/codeformat/formatimports.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright 2021 The Gitea Authors. All rights reserved.
2-
// Use of this source code is governed by a MIT-style
3-
// license that can be found in the LICENSE file.
2+
// SPDX-License-Identifier: MIT
43

54
package codeformat
65

build/codeformat/formatimports_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright 2021 The Gitea Authors. All rights reserved.
2-
// Use of this source code is governed by a MIT-style
3-
// license that can be found in the LICENSE file.
2+
// SPDX-License-Identifier: MIT
43

54
package codeformat
65

build/generate-bindata.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright 2020 The Gitea Authors. All rights reserved.
2-
// Use of this source code is governed by a MIT-style
3-
// license that can be found in the LICENSE file.
2+
// SPDX-License-Identifier: MIT
43

54
//go:build ignore
65

build/generate-emoji.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright 2020 The Gitea Authors. All rights reserved.
22
// Copyright 2015 Kenneth Shaw
3-
// Use of this source code is governed by a MIT-style
4-
// license that can be found in the LICENSE file.
3+
// SPDX-License-Identifier: MIT
54

65
//go:build ignore
76

@@ -209,8 +208,8 @@ func generate() ([]byte, error) {
209208

210209
const hdr = `
211210
// Copyright 2020 The Gitea Authors. All rights reserved.
212-
// Use of this source code is governed by a MIT-style
213-
// license that can be found in the LICENSE file.
211+
// SPDX-License-Identifier: MIT
212+
214213
215214
package emoji
216215

build/generate-go-licenses.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Copyright 2022 The Gitea Authors. All rights reserved.
2-
// Use of this source code is governed by a MIT-style
3-
// license that can be found in the LICENSE file.
2+
// SPDX-License-Identifier: MIT
43

54
//go:build ignore
65

build/gocovmerge.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright 2020 The Gitea Authors. All rights reserved.
22
// Copyright (c) 2015, Wade Simmons
3-
// Use of this source code is governed by a MIT-style
4-
// license that can be found in the LICENSE file.
3+
// SPDX-License-Identifier: MIT
54

65
// gocovmerge takes the results from multiple `go test -coverprofile` runs and
76
// merges them into one profile

cmd/admin.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright 2016 The Gogs Authors. All rights reserved.
22
// Copyright 2016 The Gitea Authors. All rights reserved.
3-
// Use of this source code is governed by a MIT-style
4-
// license that can be found in the LICENSE file.
3+
// SPDX-License-Identifier: MIT
54

65
package cmd
76

0 commit comments

Comments
 (0)