Nemcio/Gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-10-31 02:46:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix import path, fix #1782

Browse Source
This commit is contained in:
Unknwon
2015-10-15 21:28:12 -04:00
parent a749e6adcf
commit 932dbccb67
23 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.gopmfile
View File

@@ -6,7 +6,6 @@ github.com/bradfitz/gomemcache = commit:72a68649ba
github.com/Unknwon/cae = commit:2e70a1351b github.com/Unknwon/cae = commit:2e70a1351b
github.com/Unknwon/com = commit:47d7d2b81a github.com/Unknwon/com = commit:47d7d2b81a
github.com/Unknwon/i18n = commit:7457d88830 github.com/Unknwon/i18n = commit:7457d88830
github.com/Unknwon/macaron = commit:05317cffe5
github.com/Unknwon/paginater = commit:cab2d086fa github.com/Unknwon/paginater = commit:cab2d086fa
github.com/codegangsta/cli = commit:142e6cd241 github.com/codegangsta/cli = commit:142e6cd241
github.com/go-sql-driver/mysql = commit:527bcd55aa 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/gogits/go-gogs-client = commit:519eee0af0
github.com/issue9/identicon = github.com/issue9/identicon =
github.com/lib/pq = commit:b269bd035a github.com/lib/pq = commit:b269bd035a
github.com/macaron-contrib/binding = commit:1935a991f2 github.com/go-macaron/binding =
github.com/macaron-contrib/cache = commit:a139ea1eee github.com/go-macaron/cache =
github.com/macaron-contrib/captcha = commit:9a0a0b1468 github.com/go-macaron/captcha =
github.com/macaron-contrib/csrf = commit:98ddf5a710 github.com/go-macaron/csrf =
github.com/macaron-contrib/i18n = commit:da2b19e90b github.com/go-macaron/gzip =
github.com/macaron-contrib/session = commit:e48134e803 github.com/go-macaron/i18n =
github.com/macaron-contrib/toolbox = commit:acbfe36e16 github.com/go-macaron/session =
github.com/go-macaron/toolbox =
github.com/klauspost/compress =
github.com/mattn/go-sqlite3 = commit:b808f01f66 github.com/mattn/go-sqlite3 = commit:b808f01f66
github.com/mcuadros/go-version = commit:d52711f8d6 github.com/mcuadros/go-version = commit:d52711f8d6
github.com/microcosm-cc/bluemonday = commit:85ba47ef2c 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/net =
golang.org/x/text = golang.org/x/text =
gopkg.in/gomail.v2 = commit:b1e55520bf gopkg.in/gomail.v2 = commit:b1e55520bf
gopkg.in/macaron.v1 =
gopkg.in/ini.v1 = commit:e8c222fea7 gopkg.in/ini.v1 = commit:e8c222fea7
gopkg.in/redis.v2 = commit:e617904962 gopkg.in/redis.v2 = commit:e617904962

2
cmd/cert.go
View File

@@ -114,7 +114,7 @@ func runCert(ctx *cli.Context) {
SerialNumber: serialNumber, SerialNumber: serialNumber,
Subject: pkix.Name{ Subject: pkix.Name{
Organization: []string{"Acme Co"}, Organization: []string{"Acme Co"},
CommonName: "Gogs", CommonName: "Gogs",
}, },
NotBefore: notBefore, NotBefore: notBefore,
NotAfter: notAfter, NotAfter: notAfter,

19
cmd/web.go
View File

@@ -15,18 +15,19 @@ import (
"path" "path"
"strings" "strings"
"github.com/Unknwon/macaron"
"github.com/codegangsta/cli" "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/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" "github.com/mcuadros/go-version"
"gopkg.in/ini.v1" "gopkg.in/ini.v1"
"gopkg.in/macaron.v1"
api "github.com/gogits/go-gogs-client" api "github.com/gogits/go-gogs-client"
@@ -103,7 +104,7 @@ func newMacaron() *macaron.Macaron {
} }
m.Use(macaron.Recovery()) m.Use(macaron.Recovery())
if setting.EnableGzip { if setting.EnableGzip {
m.Use(macaron.Gziper()) m.Use(gzip.Gziper())
} }
if setting.Protocol == setting.FCGI { if setting.Protocol == setting.FCGI {
m.SetURLPrefix(setting.AppSubUrl) m.SetURLPrefix(setting.AppSubUrl)

2
gogs.go
View File

@@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.6.16.1008 Beta" const APP_VER = "0.6.16.1015 Beta"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

3
models/models.go
View File

@@ -52,9 +52,8 @@ func regulateTimeZone(t time.Time) time.Time {
} }
zone := t.Local().Format("-0700") zone := t.Local().Format("-0700")
log.Trace("regulateTimeZone: %s - %s", t.Local(), zone)
if len(zone) != 5 { if len(zone) != 5 {
log.Error(4, "Unprocessable timezone: %s - %s", t.Local(), zone)
return t return t
} }
hour := com.StrTo(zone[2:3]).MustInt() hour := com.StrTo(zone[2:3]).MustInt()

4
modules/auth/admin.go
View File

@@ -5,9 +5,9 @@
package auth package auth
import ( import (
"github.com/Unknwon/macaron" "gopkg.in/macaron.v1"
"github.com/macaron-contrib/binding" "github.com/go-macaron/binding"
) )
type AdminCrateUserForm struct { type AdminCrateUserForm struct {

4
modules/auth/apiv1/miscellaneous.go
View File

@@ -7,8 +7,8 @@ package apiv1
import ( import (
"reflect" "reflect"
"github.com/Unknwon/macaron" "github.com/go-macaron/binding"
"github.com/macaron-contrib/binding" "gopkg.in/macaron.v1"
"github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/auth"
) )

6
modules/auth/auth.go
View File

@@ -10,9 +10,9 @@ import (
"time" "time"
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/Unknwon/macaron" "github.com/go-macaron/binding"
"github.com/macaron-contrib/binding" "github.com/go-macaron/session"
"github.com/macaron-contrib/session" "gopkg.in/macaron.v1"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/base"

4
modules/auth/auth_form.go
View File

@@ -5,8 +5,8 @@
package auth package auth
import ( import (
"github.com/Unknwon/macaron" "github.com/go-macaron/binding"
"github.com/macaron-contrib/binding" "gopkg.in/macaron.v1"
) )
type AuthenticationForm struct { type AuthenticationForm struct {

4
modules/auth/org.go
View File

@@ -5,8 +5,8 @@
package auth package auth
import ( import (
"github.com/Unknwon/macaron" "github.com/go-macaron/binding"
"github.com/macaron-contrib/binding" "gopkg.in/macaron.v1"
) )
// ________ .__ __ .__ // ________ .__ __ .__

4
modules/auth/repo_form.go
View File

@@ -5,8 +5,8 @@
package auth package auth
import ( import (
"github.com/Unknwon/macaron" "github.com/go-macaron/binding"
"github.com/macaron-contrib/binding" "gopkg.in/macaron.v1"
) )
// _______________________________________ _________.______________________ _______________.___. // _______________________________________ _________.______________________ _______________.___.

4
modules/auth/user_form.go
View File

@@ -7,8 +7,8 @@ package auth
import ( import (
"mime/multipart" "mime/multipart"
"github.com/Unknwon/macaron" "github.com/go-macaron/binding"
"github.com/macaron-contrib/binding" "gopkg.in/macaron.v1"
) )
type InstallForm struct { type InstallForm struct {

2
modules/mailer/mail.go
View File

@@ -8,7 +8,7 @@ import (
"fmt" "fmt"
"path" "path"
"github.com/Unknwon/macaron" "gopkg.in/macaron.v1"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/base"

4
modules/middleware/auth.go
View File

@@ -8,8 +8,8 @@ import (
"fmt" "fmt"
"net/url" "net/url"
"github.com/Unknwon/macaron" "github.com/go-macaron/csrf"
"github.com/macaron-contrib/csrf" "gopkg.in/macaron.v1"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/auth"

12
modules/middleware/context.go
View File

@@ -12,11 +12,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/Unknwon/macaron" "github.com/go-macaron/cache"
"github.com/macaron-contrib/cache" "github.com/go-macaron/csrf"
"github.com/macaron-contrib/csrf" "github.com/go-macaron/i18n"
"github.com/macaron-contrib/i18n" "github.com/go-macaron/session"
"github.com/macaron-contrib/session" "gopkg.in/macaron.v1"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth" "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) { if (status/100 == 4) || (status/100 == 5) {
log.Error(4, "%s", title) log.Error(4, "%s", title)
} }
ctx.RenderData(status, []byte(title)) ctx.PlainText(status, []byte(title))
} }
// APIError logs error with title if status is 500. // APIError logs error with title if status is 500.

2
modules/middleware/org.go
View File

@@ -5,7 +5,7 @@
package middleware package middleware
import ( import (
"github.com/Unknwon/macaron" "gopkg.in/macaron.v1"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/log"

2
modules/middleware/repo.go
View File

@@ -9,9 +9,9 @@ import (
"net/url" "net/url"
"strings" "strings"
"github.com/Unknwon/macaron"
"github.com/mcuadros/go-version" "github.com/mcuadros/go-version"
"github.com/mssola/user_agent" "github.com/mssola/user_agent"
"gopkg.in/macaron.v1"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/git" "github.com/gogits/gogs/modules/git"

2
modules/setting/setting.go
View File

@@ -18,7 +18,7 @@ import (
"gopkg.in/ini.v1" "gopkg.in/ini.v1"
"github.com/Unknwon/com" "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/bindata"
"github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/log"

2
routers/admin/admin.go
View File

@@ -11,7 +11,7 @@ import (
"time" "time"
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/Unknwon/macaron" "gopkg.in/macaron.v1"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/models/cron" "github.com/gogits/gogs/models/cron"

2
routers/install.go
View File

@@ -13,9 +13,9 @@ import (
"strings" "strings"
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/Unknwon/macaron"
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
"gopkg.in/ini.v1" "gopkg.in/ini.v1"
"gopkg.in/macaron.v1"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/models/cron" "github.com/gogits/gogs/models/cron"

2
routers/user/auth.go
View File

@@ -7,7 +7,7 @@ package user
import ( import (
"net/url" "net/url"
"github.com/macaron-contrib/captcha" "github.com/go-macaron/captcha"
"github.com/gogits/gogs/models" "github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth" "github.com/gogits/gogs/modules/auth"

2
routers/user/home.go
View File

@@ -299,7 +299,7 @@ func ShowSSHKeys(ctx *middleware.Context, uid int64) {
buf.WriteString(keys[i].OmitEmail()) buf.WriteString(keys[i].OmitEmail())
buf.WriteString("\n") buf.WriteString("\n")
} }
ctx.RenderData(200, buf.Bytes()) ctx.PlainText(200, buf.Bytes())
} }
func Profile(ctx *middleware.Context) { func Profile(ctx *middleware.Context) {

2
templates/.VERSION
View File

@@ -1 +1 @@
0.6.16.1008 Beta 0.6.16.1015 Beta