Merge branch 'main' into fix-15844-move-sans-serif-up

6543 · web-flow · commit ec32897f823b · 2021-05-15T15:52:48.000+02:00
diff --git a/cmd/web.go b/cmd/web.go
@@ -175,7 +175,7 @@ func setPort(port string) error {
 
 		cfg.Section("server").Key("LOCAL_ROOT_URL").SetValue(defaultLocalURL)
 		if err := cfg.SaveTo(setting.CustomConf); err != nil {
-			return fmt.Errorf("Error saving generated JWT Secret to custom config: %v", err)
+			return fmt.Errorf("Error saving generated LOCAL_ROOT_URL to custom config: %v", err)
 		}
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ func setPort(port string) error {`
`175`	`175`
`176`	`176`	`cfg.Section("server").Key("LOCAL_ROOT_URL").SetValue(defaultLocalURL)`
`177`	`177`	`if err := cfg.SaveTo(setting.CustomConf); err != nil {`
`178`		`- return fmt.Errorf("Error saving generated JWT Secret to custom config: %v", err)`
	`178`	`+ return fmt.Errorf("Error saving generated LOCAL_ROOT_URL to custom config: %v", err)`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`	`return nil`