mirror of
https://github.com/grafana/grafana.git
synced 2026-07-29 15:59:50 -05:00
Merge branch 'master' of github.com:grafana/grafana
This commit is contained in:
@@ -563,7 +563,7 @@ func NewConfigContext(args *CommandLineArgs) error {
|
|||||||
log.Warn("require_email_validation is enabled but smpt is disabled")
|
log.Warn("require_email_validation is enabled but smpt is disabled")
|
||||||
}
|
}
|
||||||
|
|
||||||
GrafanaNetUrl = Cfg.Section("grafana.net").Key("url").MustString("https://grafana.net")
|
GrafanaNetUrl = Cfg.Section("grafana_net").Key("url").MustString("https://grafana.net")
|
||||||
|
|
||||||
imageUploadingSection := Cfg.Section("external_image_storage")
|
imageUploadingSection := Cfg.Section("external_image_storage")
|
||||||
ImageUploadProvider = imageUploadingSection.Key("provider").MustString("internal")
|
ImageUploadProvider = imageUploadingSection.Key("provider").MustString("internal")
|
||||||
|
|||||||
Reference in New Issue
Block a user