mirror of
https://github.com/go-gitea/gitea
synced 2025-07-22 18:28:37 +00:00
Merge branch 'master' into fix/3743-route-regexp-branchname
This commit is contained in:
@@ -9,8 +9,8 @@ import (
|
||||
|
||||
"github.com/urfave/cli"
|
||||
|
||||
"github.com/gogits/gogs/models"
|
||||
"github.com/gogits/gogs/modules/setting"
|
||||
"github.com/go-gitea/gitea/models"
|
||||
"github.com/go-gitea/gitea/modules/setting"
|
||||
)
|
||||
|
||||
var (
|
||||
|
@@ -16,8 +16,8 @@ import (
|
||||
"github.com/Unknwon/cae/zip"
|
||||
"github.com/urfave/cli"
|
||||
|
||||
"github.com/gogits/gogs/models"
|
||||
"github.com/gogits/gogs/modules/setting"
|
||||
"github.com/go-gitea/gitea/models"
|
||||
"github.com/go-gitea/gitea/modules/setting"
|
||||
)
|
||||
|
||||
var CmdDump = cli.Command{
|
||||
|
10
cmd/serve.go
10
cmd/serve.go
@@ -18,11 +18,11 @@ import (
|
||||
gouuid "github.com/satori/go.uuid"
|
||||
"github.com/urfave/cli"
|
||||
|
||||
"github.com/gogits/gogs/models"
|
||||
"github.com/gogits/gogs/modules/base"
|
||||
"github.com/gogits/gogs/modules/httplib"
|
||||
"github.com/gogits/gogs/modules/log"
|
||||
"github.com/gogits/gogs/modules/setting"
|
||||
"github.com/go-gitea/gitea/models"
|
||||
"github.com/go-gitea/gitea/modules/base"
|
||||
"github.com/go-gitea/gitea/modules/httplib"
|
||||
"github.com/go-gitea/gitea/modules/log"
|
||||
"github.com/go-gitea/gitea/modules/setting"
|
||||
)
|
||||
|
||||
const (
|
||||
|
@@ -9,9 +9,9 @@ import (
|
||||
|
||||
"github.com/urfave/cli"
|
||||
|
||||
"github.com/gogits/gogs/models"
|
||||
"github.com/gogits/gogs/modules/log"
|
||||
"github.com/gogits/gogs/modules/setting"
|
||||
"github.com/go-gitea/gitea/models"
|
||||
"github.com/go-gitea/gitea/modules/log"
|
||||
"github.com/go-gitea/gitea/modules/setting"
|
||||
)
|
||||
|
||||
var CmdUpdate = cli.Command{
|
||||
|
28
cmd/web.go
28
cmd/web.go
@@ -32,20 +32,20 @@ import (
|
||||
"github.com/gogits/git-module"
|
||||
"github.com/gogits/go-gogs-client"
|
||||
|
||||
"github.com/gogits/gogs/models"
|
||||
"github.com/gogits/gogs/modules/auth"
|
||||
"github.com/gogits/gogs/modules/bindata"
|
||||
"github.com/gogits/gogs/modules/context"
|
||||
"github.com/gogits/gogs/modules/log"
|
||||
"github.com/gogits/gogs/modules/setting"
|
||||
"github.com/gogits/gogs/modules/template"
|
||||
"github.com/gogits/gogs/routers"
|
||||
"github.com/gogits/gogs/routers/admin"
|
||||
apiv1 "github.com/gogits/gogs/routers/api/v1"
|
||||
"github.com/gogits/gogs/routers/dev"
|
||||
"github.com/gogits/gogs/routers/org"
|
||||
"github.com/gogits/gogs/routers/repo"
|
||||
"github.com/gogits/gogs/routers/user"
|
||||
"github.com/go-gitea/gitea/models"
|
||||
"github.com/go-gitea/gitea/modules/auth"
|
||||
"github.com/go-gitea/gitea/modules/bindata"
|
||||
"github.com/go-gitea/gitea/modules/context"
|
||||
"github.com/go-gitea/gitea/modules/log"
|
||||
"github.com/go-gitea/gitea/modules/setting"
|
||||
"github.com/go-gitea/gitea/modules/template"
|
||||
"github.com/go-gitea/gitea/routers"
|
||||
"github.com/go-gitea/gitea/routers/admin"
|
||||
apiv1 "github.com/go-gitea/gitea/routers/api/v1"
|
||||
"github.com/go-gitea/gitea/routers/dev"
|
||||
"github.com/go-gitea/gitea/routers/org"
|
||||
"github.com/go-gitea/gitea/routers/repo"
|
||||
"github.com/go-gitea/gitea/routers/user"
|
||||
)
|
||||
|
||||
var CmdWeb = cli.Command{
|
||||
|
Reference in New Issue
Block a user