Skip to content

Commit f5c5c61

Browse files
authored
Merge branch 'main' into wrap-around-prev-next
2 parents e5e00b7 + 290f458 commit f5c5c61

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

docs/content/doc/installation/from-binary.en-us.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,17 @@ chmod +x gitea
3232
```
3333

3434
## Verify GPG signature
35-
Gitea signs all binaries with a [GPG key](https://keys.openpgp.org/search?q=teabot%40gitea.io) to prevent against unwanted modification of binaries. To validate the binary, download the signature file which ends in `.asc` for the binary you downloaded and use the gpg command line tool.
35+
Gitea signs all binaries with a [GPG key](https://keys.openpgp.org/search?q=teabot%40gitea.io) to prevent against unwanted modification of binaries.
36+
To validate the binary, download the signature file which ends in `.asc` for the binary you downloaded and use the gpg command line tool.
3637

3738
```sh
3839
gpg --keyserver keys.openpgp.org --recv 7C9E68152594688862D62AF62D9AE806EC1592E2
3940
gpg --verify gitea-{{< version >}}-linux-amd64.asc gitea-{{< version >}}-linux-amd64
4041
```
4142

43+
Look for the text `Good signature from "Teabot <[email protected]>"` to assert a good binary,
44+
despite warnings like `This key is not certified with a trusted signature!`.
45+
4246
## Recommended server configuration
4347

4448
**NOTE:** Many of the following directories can be configured using [Environment Variables]({{< relref "doc/advanced/environment-variables.en-us.md" >}}) as well!

models/repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ func GetRepoInitFile(tp, name string) ([]byte, error) {
10351035

10361036
var (
10371037
reservedRepoNames = []string{".", ".."}
1038-
reservedRepoPatterns = []string{"*.git", "*.wiki"}
1038+
reservedRepoPatterns = []string{"*.git", "*.wiki", "*.rss", "*.atom"}
10391039
)
10401040

10411041
// IsUsableRepoName returns true when repository is usable

models/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ var (
814814
"user",
815815
}
816816

817-
reservedUserPatterns = []string{"*.keys", "*.gpg"}
817+
reservedUserPatterns = []string{"*.keys", "*.gpg", "*.rss", "*.atom"}
818818
)
819819

820820
// isUsableName checks if name is reserved or pattern of name is not allowed

0 commit comments

Comments
 (0)