Platform Unstable #97

Merged
max merged 34 commits from platform-unstable into master 2024-06-07 00:17:36 +03:00
Showing only changes of commit 43c4afdb25 - Show all commits

View file

@ -1,12 +1,12 @@
diff --git a/cmd/admin.go b/cmd/admin.go diff --git a/cmd/admin_auth_oauth.go b/cmd/admin_auth_oauth.go
index f9fb1b6c6..2725b1f1c 100644 index c151c0af27..e8a4f34707 100644
--- a/cmd/admin.go --- a/cmd/admin_auth_oauth.go
+++ b/cmd/admin.go +++ b/cmd/admin_auth_oauth.go
@@ -151,6 +151,7 @@ var ( @@ -34,6 +34,7 @@ var (
Name: "secret", Name: "secret",
Value: "", Value: "",
Usage: "Client Secret", Usage: "Client Secret",
+ EnvVar: "FORGEJO_ADMIN_OAUTH2_SECRET", + EnvVars: []string{"FORGEJO_ADMIN_OAUTH2_SECRET"},
}, },
cli.StringFlag{ &cli.StringFlag{
Name: "auto-discover-url", Name: "auto-discover-url",