Skip to content

Commit f7b0d7e

Browse files
committed
Merge remote-tracking branch 'upstream/main'
* upstream/main: Clean template/helper.go (go-gitea#23922) Remove `Repository.getFilesChanged` to fix Actions `paths` and `paths-ignore` filter (go-gitea#23920) Hardcode path to docker images (go-gitea#23955) Title can be empty when creating tag only (go-gitea#23917) Actions: Use default branch as ref when a branch/tag delete occurs (go-gitea#23910) Refactor authors dropdown (send get request from frontend to avoid long wait time) (go-gitea#23890) [skip ci] Updated translations via Crowdin Merge `push to create`, `open PR from push`, and `push options` docs articles into one (go-gitea#23744) Delete deleted release attachments immediately from storage (go-gitea#23913) More specific and unique feed name for NuGet install command template. (go-gitea#23889) Treat PRs with agit flow as fork PRs when triggering actions. (go-gitea#23884) Use graceful editorconfig loader to reduce errors when loading malformed editorconfigs (go-gitea#21257) Remove -v from vulncheck (go-gitea#23953) Improve permission check of packages (go-gitea#23879) Adjust some documentations titles (go-gitea#23941)
2 parents 512ce49 + ff2f479 commit f7b0d7e

File tree

78 files changed

+628
-374
lines changed

Some content is hidden

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

78 files changed

+628
-374
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Build stage
2-
FROM golang:1.20-alpine3.17 AS build-env
2+
FROM docker.io/library/golang:1.20-alpine3.17 AS build-env
33

44
ARG GOPROXY
55
ENV GOPROXY ${GOPROXY:-direct}
@@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
2323
# Begin env-to-ini build
2424
RUN go build contrib/environment-to-ini/environment-to-ini.go
2525

26-
FROM alpine:3.17
26+
FROM docker.io/library/alpine:3.17
2727
LABEL maintainer="[email protected]"
2828

2929
EXPOSE 22 3000

Dockerfile.rootless

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#Build stage
2-
FROM golang:1.20-alpine3.17 AS build-env
2+
FROM docker.io/library/golang:1.20-alpine3.17 AS build-env
33

44
ARG GOPROXY
55
ENV GOPROXY ${GOPROXY:-direct}
@@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
2323
# Begin env-to-ini build
2424
RUN go build contrib/environment-to-ini/environment-to-ini.go
2525

26-
FROM alpine:3.17
26+
FROM docker.io/library/alpine:3.17
2727
LABEL maintainer="[email protected]"
2828

2929
EXPOSE 2222 3000

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ generate-go: $(TAGS_PREREQ)
747747

748748
.PHONY: security-check
749749
security-check:
750-
go run $(GOVULNCHECK_PACKAGE) -v ./...
750+
go run $(GOVULNCHECK_PACKAGE) ./...
751751

752752
$(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
753753
CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@

docs/content/doc/administration/backup-and-restore.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
date: "2017-01-01T16:00:00+02:00"
3-
title: "Usage: Backup and Restore"
3+
title: "Backup and Restore"
44
slug: "backup-and-restore"
55
weight: 11
66
toc: false

docs/content/doc/administration/command-line.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
date: "2017-01-01T16:00:00+02:00"
3-
title: "Usage: Command Line"
3+
title: "Gitea Command Line"
44
slug: "command-line"
55
weight: 1
66
toc: false

docs/content/doc/administration/email-setup.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
date: "2019-10-15T10:10:00+05:00"
3-
title: "Usage: Email setup"
3+
title: "Email setup"
44
slug: "email-setup"
55
weight: 12
66
toc: false

docs/content/doc/administration/fail2ban-setup.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
date: "2018-05-11T11:00:00+02:00"
3-
title: "Usage: Setup fail2ban"
3+
title: "Fail2ban Setup "
44
slug: "fail2ban-setup"
55
weight: 16
66
toc: false

docs/content/doc/administration/fail2ban-setup.zh-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
date: "2022-08-01T00:00:00+00:00"
3-
title: "使用: 设置 Fail2ban"
3+
title: "设置 Fail2ban"
44
slug: "fail2ban-setup"
55
weight: 16
66
toc: false

docs/content/doc/administration/git-lfs-support.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
date: "2019-10-06T08:00:00+05:00"
3-
title: "Usage: Git LFS setup"
3+
title: "Git LFS setup"
44
slug: "git-lfs-setup"
55
weight: 12
66
toc: false

docs/content/doc/administration/https-support.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
date: "2018-06-02T11:00:00+02:00"
3-
title: "Usage: HTTPS setup"
3+
title: "HTTPS setup"
44
slug: "https-setup"
55
weight: 12
66
toc: false

0 commit comments

Comments
 (0)