From e7f1d45eb5b20e782303fb7ce75e8c9877618b17 Mon Sep 17 00:00:00 2001 From: John Olheiser Date: Tue, 10 Jan 2023 13:01:52 -0600 Subject: [PATCH 1/3] fix: omit avatar_url in discord payload when empty (#22393) Fixes #22391 This field is optional for Discord, however when it exists in the payload it is now validated. Omitting it entirely just makes Discord use the default for that webhook, which is set on the Discord side. Signed-off-by: jolheiser --- services/webhook/discord.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/webhook/discord.go b/services/webhook/discord.go index ed44fef404..014d409ce7 100644 --- a/services/webhook/discord.go +++ b/services/webhook/discord.go @@ -55,7 +55,7 @@ type ( Wait bool `json:"wait"` Content string `json:"content"` Username string `json:"username"` - AvatarURL string `json:"avatar_url"` + AvatarURL string `json:"avatar_url,omitempty"` TTS bool `json:"tts"` Embeds []DiscordEmbed `json:"embeds"` } From 70043da3ddc2164d1549a1246c1f9f0bb6ad2485 Mon Sep 17 00:00:00 2001 From: delvh Date: Tue, 10 Jan 2023 22:00:42 +0100 Subject: [PATCH 2/3] Fix typo (#22396) DEFAUlT -> DEFAULT --- docs/content/doc/advanced/config-cheat-sheet.en-us.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 3b2ff4cbbf..def7314720 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -1048,7 +1048,7 @@ Default templates for project boards: ## Git - Timeout settings (`git.timeout`) -- `DEFAUlT`: **360**: Git operations default timeout seconds. +- `DEFAULT`: **360**: Git operations default timeout seconds. - `MIGRATE`: **600**: Migrate external repositories timeout seconds. - `MIRROR`: **300**: Mirror external repositories timeout seconds. - `CLONE`: **300**: Git clone from internal repositories timeout seconds. From dc5f2cf5906ec2f87ad47ea4724cc245c401eef6 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 10 Jan 2023 17:21:24 -0500 Subject: [PATCH 3/3] cgo cross-compile for freebsd (#22397) Provide pre-compiled cgo binaries for freebsd Co-authored-by: John Olheiser --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 06a0d1c18e..4283e5f8b7 100644 --- a/Makefile +++ b/Makefile @@ -751,7 +751,7 @@ $(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ) CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ .PHONY: release -release: frontend generate release-windows release-linux release-darwin release-copy release-compress vendor release-sources release-docs release-check +release: frontend generate release-windows release-linux release-darwin release-freebsd release-copy release-compress vendor release-sources release-docs release-check $(DIST_DIRS): mkdir -p $(DIST_DIRS) @@ -780,6 +780,13 @@ ifeq ($(CI),true) cp /build/* $(DIST)/binaries endif +.PHONY: release-freebsd +release-freebsd: | $(DIST_DIRS) + CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) run $(XGO_PACKAGE) -go $(XGO_VERSION) -dest $(DIST)/binaries -tags 'netgo osusergo $(TAGS)' -ldflags '$(LDFLAGS)' -targets 'freebsd/amd64' -out gitea-$(VERSION) . +ifeq ($(CI),true) + cp /build/* $(DIST)/binaries +endif + .PHONY: release-copy release-copy: | $(DIST_DIRS) cd $(DIST); for file in `find . -type f -name "*"`; do cp $${file} ./release/; done;