IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'new_macaron'

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-01-13 15:48:49 +01:00
parent 77c362af8d 2cf0dc2cb2
commit 6da3af5e89
156 changed files with 10337 additions and 6330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/middleware/auth.go
View File

@@ -4,7 +4,7 @@ import (
"net/url"
"strings"
"github.com/Unknwon/macaron"
"gopkg.in/macaron.v1"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"

2
pkg/middleware/logger.go
View File

@@ -20,9 +20,9 @@ import (
"net/http"
"time"
"github.com/Unknwon/macaron"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/setting"
"gopkg.in/macaron.v1"
)
func Logger() macaron.Handler {

2
pkg/middleware/middleware.go
View File

@@ -4,7 +4,7 @@ import (
"strconv"
"strings"
"github.com/Unknwon/macaron"
"gopkg.in/macaron.v1"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/apikeygen"

4
pkg/middleware/middleware_test.go
View File

@@ -7,13 +7,13 @@ import (
"path/filepath"
"testing"
"github.com/Unknwon/macaron"
"github.com/go-macaron/session"
"github.com/grafana/grafana/pkg/bus"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/util"
"github.com/macaron-contrib/session"
. "github.com/smartystreets/goconvey/convey"
"gopkg.in/macaron.v1"
)
func TestMiddlewareContext(t *testing.T) {

2
pkg/middleware/quota.go
View File

@@ -3,11 +3,11 @@ package middleware
import (
"fmt"
"github.com/Unknwon/macaron"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
m "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/setting"
"gopkg.in/macaron.v1"
)
func Quota(target string) macaron.Handler {

12
pkg/middleware/session.go
View File

@@ -3,12 +3,12 @@ package middleware
import (
"time"
"github.com/Unknwon/macaron"
"github.com/macaron-contrib/session"
_ "github.com/macaron-contrib/session/memcache"
_ "github.com/macaron-contrib/session/mysql"
_ "github.com/macaron-contrib/session/postgres"
_ "github.com/macaron-contrib/session/redis"
"github.com/go-macaron/session"
_ "github.com/go-macaron/session/memcache"
_ "github.com/go-macaron/session/mysql"
_ "github.com/go-macaron/session/postgres"
_ "github.com/go-macaron/session/redis"
"gopkg.in/macaron.v1"
)
const (

5
pkg/middleware/util.go
View File

@@ -3,11 +3,12 @@ package middleware
import (
"strings"
"github.com/Unknwon/macaron"
"github.com/go-macaron/gzip"
"gopkg.in/macaron.v1"
)
func Gziper() macaron.Handler {
macaronGziper := macaron.Gziper()
macaronGziper := gzip.Gziper()
return func(ctx *macaron.Context) {
requestPath := ctx.Req.URL.RequestURI()

2
pkg/middleware/validate_host.go
View File

@@ -3,8 +3,8 @@ package middleware
import (
"strings"
"github.com/Unknwon/macaron"
"github.com/grafana/grafana/pkg/setting"
"gopkg.in/macaron.v1"
)
func ValidateHostHeader(domain string) macaron.Handler {