From 932dbccb6738b2894e4faafce4f834ef6803efc6 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Thu, 15 Oct 2015 21:28:12 -0400 Subject: [PATCH] fix import path, fix #1782 --- .gopmfile | 18 ++++++++++-------- cmd/cert.go | 2 +- cmd/web.go | 19 ++++++++++--------- gogs.go | 2 +- models/models.go | 3 +-- modules/auth/admin.go | 4 ++-- modules/auth/apiv1/miscellaneous.go | 4 ++-- modules/auth/auth.go | 6 +++--- modules/auth/auth_form.go | 4 ++-- modules/auth/org.go | 4 ++-- modules/auth/repo_form.go | 4 ++-- modules/auth/user_form.go | 4 ++-- modules/mailer/mail.go | 2 +- modules/middleware/auth.go | 4 ++-- modules/middleware/context.go | 12 ++++++------ modules/middleware/org.go | 2 +- modules/middleware/repo.go | 2 +- modules/setting/setting.go | 2 +- routers/admin/admin.go | 2 +- routers/install.go | 2 +- routers/user/auth.go | 2 +- routers/user/home.go | 2 +- templates/.VERSION | 2 +- 23 files changed, 55 insertions(+), 53 deletions(-) diff --git a/.gopmfile b/.gopmfile index a1ce2984d9..2ed63d8961 100644 --- a/.gopmfile +++ b/.gopmfile @@ -6,7 +6,6 @@ github.com/bradfitz/gomemcache = commit:72a68649ba github.com/Unknwon/cae = commit:2e70a1351b github.com/Unknwon/com = commit:47d7d2b81a github.com/Unknwon/i18n = commit:7457d88830 -github.com/Unknwon/macaron = commit:05317cffe5 github.com/Unknwon/paginater = commit:cab2d086fa github.com/codegangsta/cli = commit:142e6cd241 github.com/go-sql-driver/mysql = commit:527bcd55aa @@ -16,13 +15,15 @@ github.com/gogits/chardet = commit:2404f77725 github.com/gogits/go-gogs-client = commit:519eee0af0 github.com/issue9/identicon = github.com/lib/pq = commit:b269bd035a -github.com/macaron-contrib/binding = commit:1935a991f2 -github.com/macaron-contrib/cache = commit:a139ea1eee -github.com/macaron-contrib/captcha = commit:9a0a0b1468 -github.com/macaron-contrib/csrf = commit:98ddf5a710 -github.com/macaron-contrib/i18n = commit:da2b19e90b -github.com/macaron-contrib/session = commit:e48134e803 -github.com/macaron-contrib/toolbox = commit:acbfe36e16 +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/klauspost/compress = github.com/mattn/go-sqlite3 = commit:b808f01f66 github.com/mcuadros/go-version = commit:d52711f8d6 github.com/microcosm-cc/bluemonday = commit:85ba47ef2c @@ -34,6 +35,7 @@ github.com/shurcooL/sanitized_anchor_name = commit:244f5ac324 golang.org/x/net = golang.org/x/text = gopkg.in/gomail.v2 = commit:b1e55520bf +gopkg.in/macaron.v1 = gopkg.in/ini.v1 = commit:e8c222fea7 gopkg.in/redis.v2 = commit:e617904962 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) diff --git a/gogs.go b/gogs.go index e4c072d676..f1e83532f0 100644 --- a/gogs.go +++ b/gogs.go @@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.6.16.1008 Beta" +const APP_VER = "0.6.16.1015 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/models.go b/models/models.go index 2410ecd4e2..802bc9426a 100644 --- a/models/models.go +++ b/models/models.go @@ -52,9 +52,8 @@ func regulateTimeZone(t time.Time) time.Time { } zone := t.Local().Format("-0700") - log.Trace("regulateTimeZone: %s - %s", t.Local(), zone) - if len(zone) != 5 { + log.Error(4, "Unprocessable timezone: %s - %s", t.Local(), zone) return t } hour := com.StrTo(zone[2:3]).MustInt() diff --git a/modules/auth/admin.go b/modules/auth/admin.go index a4aa67ff9b..c2d47a44fd 100644 --- a/modules/auth/admin.go +++ b/modules/auth/admin.go @@ -5,9 +5,9 @@ package auth import ( - "github.com/Unknwon/macaron" + "gopkg.in/macaron.v1" - "github.com/macaron-contrib/binding" + "github.com/go-macaron/binding" ) type AdminCrateUserForm struct { diff --git a/modules/auth/apiv1/miscellaneous.go b/modules/auth/apiv1/miscellaneous.go index e05b48381f..5032f0ac71 100644 --- a/modules/auth/apiv1/miscellaneous.go +++ b/modules/auth/apiv1/miscellaneous.go @@ -7,8 +7,8 @@ package apiv1 import ( "reflect" - "github.com/Unknwon/macaron" - "github.com/macaron-contrib/binding" + "github.com/go-macaron/binding" + "gopkg.in/macaron.v1" "github.com/gogits/gogs/modules/auth" ) diff --git a/modules/auth/auth.go b/modules/auth/auth.go index ecae5b06b0..f144899b3c 100644 --- a/modules/auth/auth.go +++ b/modules/auth/auth.go @@ -10,9 +10,9 @@ import ( "time" "github.com/Unknwon/com" - "github.com/Unknwon/macaron" - "github.com/macaron-contrib/binding" - "github.com/macaron-contrib/session" + "github.com/go-macaron/binding" + "github.com/go-macaron/session" + "gopkg.in/macaron.v1" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" diff --git a/modules/auth/auth_form.go b/modules/auth/auth_form.go index 7ac47fcc3a..6f356344da 100644 --- a/modules/auth/auth_form.go +++ b/modules/auth/auth_form.go @@ -5,8 +5,8 @@ package auth import ( - "github.com/Unknwon/macaron" - "github.com/macaron-contrib/binding" + "github.com/go-macaron/binding" + "gopkg.in/macaron.v1" ) type AuthenticationForm struct { diff --git a/modules/auth/org.go b/modules/auth/org.go index 6d9a7269ec..0642d1cb7c 100644 --- a/modules/auth/org.go +++ b/modules/auth/org.go @@ -5,8 +5,8 @@ package auth import ( - "github.com/Unknwon/macaron" - "github.com/macaron-contrib/binding" + "github.com/go-macaron/binding" + "gopkg.in/macaron.v1" ) // ________ .__ __ .__ diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 3a74bbe000..ac43ba5d96 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -5,8 +5,8 @@ package auth import ( - "github.com/Unknwon/macaron" - "github.com/macaron-contrib/binding" + "github.com/go-macaron/binding" + "gopkg.in/macaron.v1" ) // _______________________________________ _________.______________________ _______________.___. diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go index 53f5fb15c6..88d6dd9fba 100644 --- a/modules/auth/user_form.go +++ b/modules/auth/user_form.go @@ -7,8 +7,8 @@ package auth import ( "mime/multipart" - "github.com/Unknwon/macaron" - "github.com/macaron-contrib/binding" + "github.com/go-macaron/binding" + "gopkg.in/macaron.v1" ) type InstallForm struct { diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go index ccec7544a0..680a3c483e 100644 --- a/modules/mailer/mail.go +++ b/modules/mailer/mail.go @@ -8,7 +8,7 @@ import ( "fmt" "path" - "github.com/Unknwon/macaron" + "gopkg.in/macaron.v1" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/base" diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go index be8db35733..823e457af6 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 c08f84925e..dffebe6f2b 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 065e1b1e92..1e7d4a6797 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 0b519a6bdb..ba7cbac821 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" diff --git a/modules/setting/setting.go b/modules/setting/setting.go index b817f10bc2..6b5a365980 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -18,7 +18,7 @@ import ( "gopkg.in/ini.v1" "github.com/Unknwon/com" - "github.com/macaron-contrib/session" + "github.com/go-macaron/session" "github.com/gogits/gogs/modules/bindata" "github.com/gogits/gogs/modules/log" diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 54d1a1450f..54e4559ff9 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -11,7 +11,7 @@ import ( "time" "github.com/Unknwon/com" - "github.com/Unknwon/macaron" + "gopkg.in/macaron.v1" "github.com/gogits/gogs/models" "github.com/gogits/gogs/models/cron" diff --git a/routers/install.go b/routers/install.go index b252308011..4b22463ed5 100644 --- a/routers/install.go +++ b/routers/install.go @@ -13,9 +13,9 @@ import ( "strings" "github.com/Unknwon/com" - "github.com/Unknwon/macaron" "github.com/go-xorm/xorm" "gopkg.in/ini.v1" + "gopkg.in/macaron.v1" "github.com/gogits/gogs/models" "github.com/gogits/gogs/models/cron" diff --git a/routers/user/auth.go b/routers/user/auth.go index 8037f76fc1..54cbf4475e 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -7,7 +7,7 @@ package user import ( "net/url" - "github.com/macaron-contrib/captcha" + "github.com/go-macaron/captcha" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/auth" diff --git a/routers/user/home.go b/routers/user/home.go index 8008889d49..581bb0633c 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -299,7 +299,7 @@ func ShowSSHKeys(ctx *middleware.Context, uid int64) { buf.WriteString(keys[i].OmitEmail()) buf.WriteString("\n") } - ctx.RenderData(200, buf.Bytes()) + ctx.PlainText(200, buf.Bytes()) } func Profile(ctx *middleware.Context) { diff --git a/templates/.VERSION b/templates/.VERSION index 6be1b25532..581883e0ca 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.16.1008 Beta \ No newline at end of file +0.6.16.1015 Beta \ No newline at end of file