diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/issue.go | 2 | ||||
| -rw-r--r-- | models/migrations/migrations.go | 2 | ||||
| -rw-r--r-- | models/token.go | 5 | ||||
| -rw-r--r-- | models/webhook.go | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/models/issue.go b/models/issue.go index 326454630e..c34c3f5574 100644 --- a/models/issue.go +++ b/models/issue.go @@ -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 ( diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 78729bdedb..c8e399e15a 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -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 diff --git a/models/token.go b/models/token.go index 136753c324..adf50a4321 100644 --- a/models/token.go +++ b/models/token.go @@ -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 } diff --git a/models/webhook.go b/models/webhook.go index bdfb62d899..c20a72e97e 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -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 |