opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 19:02:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Settings: Remove global variable (#26613)

Browse Source
This commit is contained in:
Torkel Ödegaard
2020-07-27 08:36:36 +02:00
committed by GitHub
parent ae3c285312
commit 3defb4441e
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/metrics.go
View File

@ -7,7 +7,6 @@ import (
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
@ -77,7 +76,7 @@ func (hs *HTTPServer) QueryMetricsV2(c *models.ReqContext, reqDto dtos.MetricReq
return Error(500, "Metric request error", err)
}
} else {
if !setting.IsExpressionsEnabled() {
if !hs.Cfg.IsExpressionsEnabled() {
return Error(404, "Expressions feature toggle is not enabled", nil)
}