diff options
Diffstat (limited to 'modules/middleware')
| -rw-r--r-- | modules/middleware/auth.go | 4 | ||||
| -rw-r--r-- | modules/middleware/context.go | 12 | ||||
| -rw-r--r-- | modules/middleware/org.go | 2 | ||||
| -rw-r--r-- | modules/middleware/repo.go | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go index be8db357..823e457a 100644 --- a/modules/middleware/auth.go +++ b/modules/middleware/auth.go @@ -8,8 +8,8 @@ import ( "fmt" "net/url" - "github.com/Unknwon/macaron" - "github.com/macaron-contrib/csrf" + "github.com/go-macaron/csrf" + "gopkg.in/macaron.v1" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" diff --git a/modules/middleware/context.go b/modules/middleware/context.go index c08f8492..dffebe6f 100644 --- a/modules/middleware/context.go +++ b/modules/middleware/context.go @@ -12,11 +12,11 @@ import ( "strings" "time" - "github.com/Unknwon/macaron" - "github.com/macaron-contrib/cache" - "github.com/macaron-contrib/csrf" - "github.com/macaron-contrib/i18n" - "github.com/macaron-contrib/session" + "github.com/go-macaron/cache" + "github.com/go-macaron/csrf" + "github.com/go-macaron/i18n" + "github.com/go-macaron/session" + "gopkg.in/macaron.v1" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" @@ -154,7 +154,7 @@ func (ctx *Context) HandleText(status int, title string) { if (status/100 == 4) || (status/100 == 5) { log.Error(4, "%s", title) } - ctx.RenderData(status, []byte(title)) + ctx.PlainText(status, []byte(title)) } // APIError logs error with title if status is 500. diff --git a/modules/middleware/org.go b/modules/middleware/org.go index 065e1b1e..1e7d4a67 100644 --- a/modules/middleware/org.go +++ b/modules/middleware/org.go @@ -5,7 +5,7 @@ package middleware import ( - "github.com/Unknwon/macaron" + "gopkg.in/macaron.v1" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/log" diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index 0b519a6b..ba7cbac8 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -9,9 +9,9 @@ import ( "net/url" "strings" - "github.com/Unknwon/macaron" "github.com/mcuadros/go-version" "github.com/mssola/user_agent" + "gopkg.in/macaron.v1" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/git" |