finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace uuid module with original package

Browse source
This commit is contained in:
Unknwon 2016-02-20 18:13:12 -05:00
parent 926e75d721
commit ac78bae7b5
11 changed files with 12 additions and 912 deletions
Download patch file Download diff file Expand all files Collapse all files

2
models/issue.go
View file

@ -17,11 +17,11 @@ import (
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
gouuid "github.com/gogits/gogs/modules/uuid"
)
var (

2
models/migrations/migrations.go
View file

@ -16,12 +16,12 @@ import (
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
"gopkg.in/ini.v1"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
gouuid "github.com/gogits/gogs/modules/uuid"
)
const _MIN_DB_VER = 4

5
models/token.go
View file

@ -7,8 +7,9 @@ package models
import (
"time"
gouuid "github.com/satori/go.uuid"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/uuid"
)
// AccessToken represents a personal access token.
@ -25,7 +26,7 @@ type AccessToken struct {
// NewAccessToken creates new access token.
func NewAccessToken(t *AccessToken) error {
t.Sha1 = base.EncodeSha1(uuid.NewV4().String())
t.Sha1 = base.EncodeSha1(gouuid.NewV4().String())
_, err := x.Insert(t)
return err
}

4
models/webhook.go
View file

@ -15,13 +15,13 @@ import (
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/modules/httplib"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/uuid"
)
type HookContentType int
@ -361,7 +361,7 @@ func CreateHookTask(t *HookTask) error {
if err != nil {
return err
}
t.UUID = uuid.NewV4().String()
t.UUID = gouuid.NewV4().String()
t.PayloadContent = string(data)
_, err = x.Insert(t)
return err