Merge pull request #12175 from grafana/davkal/12168-fix-explore-setting

Respect explore settings in config ini
2018-06-07 12:08:42 +02:00
parent 82ae7c6eee 3bd58446d6
commit 3fb4eb7322
5 changed files with 17 additions and 3 deletions
@@ -151,6 +151,7 @@ func getFrontendSettingsMap(c *m.ReqContext) (map[string]interface{}, error) {
 		"authProxyEnabled":        setting.AuthProxyEnabled,
 		"ldapEnabled":             setting.LdapEnabled,
 		"alertingEnabled":         setting.AlertingEnabled,
+		"exploreEnabled":          setting.ExploreEnabled,
 		"googleAnalyticsId":       setting.GoogleAnalyticsId,
 		"disableLoginForm":        setting.DisableLoginForm,
 		"externalUserMngInfo":     setting.ExternalUserMngInfo,