From 00629fea95970e99ba5ef05954bbad0804805df6 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Tue, 22 Oct 2019 14:11:01 +0200 Subject: [assets] configurable URL for static resources (#7911) * static url * add cors support for static resources * [assets] work on the migration to configurable url for assets Signed-off-by: Jakob Ackermann * [misc] fix whitespace Signed-off-by: Jakob Ackermann * [assets] fix the loading of the manifest.json It is generated dynamically, and as such can not be served by the cdn. Signed-off-by: Jakob Ackermann * Revert "add cors support for static resources" This reverts commit 42f964fd181dbb8b139808b9be623470d4f0e40f Signed-off-by: Jakob Ackermann * [docs] add the STATIC_URL_PREFIX option Signed-off-by: Jakob Ackermann * [docs] reverse-proxy: nginx: add two setups for STATIC_URL_PREFIX Signed-off-by: Jakob Ackermann * [assets] migrate the url of a new asset to the static url prefix REF: f2a3abc683ad4b2177b7c7c6160a2c0b4316120a Signed-off-by: Jakob Ackermann --- templates/repo/settings/webhook/list.tmpl | 14 +++++++------- templates/repo/settings/webhook/new.tmpl | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'templates/repo/settings') diff --git a/templates/repo/settings/webhook/list.tmpl b/templates/repo/settings/webhook/list.tmpl index 8fdae45b1b..d1784564dc 100644 --- a/templates/repo/settings/webhook/list.tmpl +++ b/templates/repo/settings/webhook/list.tmpl @@ -6,25 +6,25 @@
{{.i18n.Tr "repo.settings.add_webhook"}}
diff --git a/templates/repo/settings/webhook/new.tmpl b/templates/repo/settings/webhook/new.tmpl index 358827c0f8..1d5d849738 100644 --- a/templates/repo/settings/webhook/new.tmpl +++ b/templates/repo/settings/webhook/new.tmpl @@ -8,19 +8,19 @@ {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}}
{{if eq .HookType "gitea"}} - + {{else if eq .HookType "gogs"}} - + {{else if eq .HookType "slack"}} - + {{else if eq .HookType "discord"}} - + {{else if eq .HookType "dingtalk"}} - + {{else if eq .HookType "telegram"}} - + {{else if eq .HookType "msteams"}} - + {{end}}
-- cgit v1.2.3