diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2016-11-04 00:11:08 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-04 00:11:08 +0800 |
| commit | 1adde07a3fc4a43ec3d5829dc3e5ba9587584f77 (patch) | |
| tree | 5718e7f30d625d25a61368453830cac17a8b1e6f /cmd | |
| parent | 8ea63f8c506410d09e6b8b0dbcb102271bd9cbbe (diff) | |
| parent | 42a744d9e61168765f97884a8efec13cd3fedff7 (diff) | |
| download | gitea-1adde07a3fc4a43ec3d5829dc3e5ba9587584f77.tar.gz gitea-1adde07a3fc4a43ec3d5829dc3e5ba9587584f77.zip | |
Merge branch 'master' into fix/3743-route-regexp-branchname
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/admin.go | 4 | ||||
| -rw-r--r-- | cmd/dump.go | 4 | ||||
| -rw-r--r-- | cmd/serve.go | 10 | ||||
| -rw-r--r-- | cmd/update.go | 6 | ||||
| -rw-r--r-- | cmd/web.go | 28 |
5 files changed, 26 insertions, 26 deletions
diff --git a/cmd/admin.go b/cmd/admin.go index bad36b1c85..a10e0e5fe5 100644 --- a/cmd/admin.go +++ b/cmd/admin.go @@ -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 ( diff --git a/cmd/dump.go b/cmd/dump.go index c1361f9328..1e03ef74f0 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -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{ diff --git a/cmd/serve.go b/cmd/serve.go index 53d33b2edd..051e215db1 100644 --- a/cmd/serve.go +++ b/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 ( diff --git a/cmd/update.go b/cmd/update.go index bebc101609..450d18a08a 100644 --- a/cmd/update.go +++ b/cmd/update.go @@ -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{ diff --git a/cmd/web.go b/cmd/web.go index a3a214e19d..d5dae5badc 100644 --- a/cmd/web.go +++ b/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{ |