diff options
| author | Unknwon <u@gogs.io> | 2015-10-15 21:28:12 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-10-15 21:28:12 -0400 |
| commit | 932dbccb6738b2894e4faafce4f834ef6803efc6 (patch) | |
| tree | 14cd0a6cbce5906ce394491bd00e1f790be1dcc7 /cmd | |
| parent | a749e6adcf97d21e8fd64cdf92de52a1ada68f6d (diff) | |
| download | gitea-932dbccb6738b2894e4faafce4f834ef6803efc6.tar.gz gitea-932dbccb6738b2894e4faafce4f834ef6803efc6.zip | |
fix import path, fix #1782
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/cert.go | 2 | ||||
| -rw-r--r-- | cmd/web.go | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/cmd/cert.go b/cmd/cert.go index 0a09b00344..5b182da9e0 100644 --- a/cmd/cert.go +++ b/cmd/cert.go @@ -114,7 +114,7 @@ func runCert(ctx *cli.Context) { SerialNumber: serialNumber, Subject: pkix.Name{ Organization: []string{"Acme Co"}, - CommonName: "Gogs", + CommonName: "Gogs", }, NotBefore: notBefore, NotAfter: notAfter, diff --git a/cmd/web.go b/cmd/web.go index 30fd4b7957..6ca61aea96 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -15,18 +15,19 @@ import ( "path" "strings" - "github.com/Unknwon/macaron" "github.com/codegangsta/cli" + "github.com/go-macaron/binding" + "github.com/go-macaron/cache" + "github.com/go-macaron/captcha" + "github.com/go-macaron/csrf" + "github.com/go-macaron/gzip" + "github.com/go-macaron/i18n" + "github.com/go-macaron/session" + "github.com/go-macaron/toolbox" "github.com/go-xorm/xorm" - "github.com/macaron-contrib/binding" - "github.com/macaron-contrib/cache" - "github.com/macaron-contrib/captcha" - "github.com/macaron-contrib/csrf" - "github.com/macaron-contrib/i18n" - "github.com/macaron-contrib/session" - "github.com/macaron-contrib/toolbox" "github.com/mcuadros/go-version" "gopkg.in/ini.v1" + "gopkg.in/macaron.v1" api "github.com/gogits/go-gogs-client" @@ -103,7 +104,7 @@ func newMacaron() *macaron.Macaron { } m.Use(macaron.Recovery()) if setting.EnableGzip { - m.Use(macaron.Gziper()) + m.Use(gzip.Gziper()) } if setting.Protocol == setting.FCGI { m.SetURLPrefix(setting.AppSubUrl) |