@@ -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 | |||
@@ -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, |
@@ -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) |
@@ -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()) |
@@ -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() |
@@ -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 { |
@@ -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" | |||
) |
@@ -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" |
@@ -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 { |
@@ -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" | |||
) | |||
// ________ .__ __ .__ |
@@ -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" | |||
) | |||
// _______________________________________ _________.______________________ _______________.___. |
@@ -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 { |
@@ -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" |
@@ -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" |
@@ -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. |
@@ -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" |
@@ -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" |
@@ -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" |
@@ -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" |
@@ -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" |
@@ -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" |
@@ -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) { |
@@ -1 +1 @@ | |||
0.6.16.1008 Beta | |||
0.6.16.1015 Beta |