From 8fdc5247de76e16899755c64a6d07d856a9d8a92 Mon Sep 17 00:00:00 2001 From: rstular Date: Wed, 17 Nov 2021 03:53:15 +0100 Subject: [PATCH 1/2] Update for reverse proxying static resources (#17670) Gitea fetches static resources from /assets, so nginx configuration has to be updated accordingly. Co-authored-by: zeripath Co-authored-by: wxiaoguang --- docs/content/doc/usage/reverse-proxies.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/usage/reverse-proxies.en-us.md b/docs/content/doc/usage/reverse-proxies.en-us.md index 72998609d926a..a22dba2bc45be 100644 --- a/docs/content/doc/usage/reverse-proxies.en-us.md +++ b/docs/content/doc/usage/reverse-proxies.en-us.md @@ -80,7 +80,7 @@ server { listen 80; server_name git.example.com; - location /_/static { + location /_/static/assets { alias /path/to/gitea/public; } From 42670e6b1c8f6dc34785a2efdacf22b749ce7a28 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 17 Nov 2021 10:54:05 +0800 Subject: [PATCH 2/2] Set unit test timeout to 20 minutes (#17664) * Set unit test timeout to 15 minutes * Update Makefile Co-authored-by: silverwind Co-authored-by: silverwind Co-authored-by: techknowlogick --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index aa47cea53477b..6337268c0fad0 100644 --- a/Makefile +++ b/Makefile @@ -392,7 +392,7 @@ coverage: .PHONY: unit-test-coverage unit-test-coverage: @echo "Running unit-test-coverage $(GOTESTFLAGS) -tags '$(TEST_TAGS)'..." - @$(GO) test $(GOTESTFLAGS) -mod=vendor -tags='$(TEST_TAGS)' -cover -coverprofile coverage.out $(GO_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1 + @$(GO) test $(GOTESTFLAGS) -mod=vendor -timeout=20m -tags='$(TEST_TAGS)' -cover -coverprofile coverage.out $(GO_PACKAGES) && echo "\n==>\033[32m Ok\033[m\n" || exit 1 .PHONY: vendor vendor: