diff options
| author | Tamal Saha <tamal@appscode.com> | 2019-08-23 09:40:30 -0700 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-08-23 12:40:29 -0400 |
| commit | 171b3598778a1ecd0a921c71ed6755bfef68f7f0 (patch) | |
| tree | 02857629ef9e8e26ee0ee559153f803f77b588b7 /routers/admin | |
| parent | ca6fb004ac50fc924861112403895d637c6a2d1d (diff) | |
| download | gitea-171b3598778a1ecd0a921c71ed6755bfef68f7f0.tar.gz gitea-171b3598778a1ecd0a921c71ed6755bfef68f7f0.zip | |
Use gitea forked macaron (#7933)
Signed-off-by: Tamal Saha <tamal@appscode.com>
Diffstat (limited to 'routers/admin')
| -rw-r--r-- | routers/admin/admin.go | 6 | ||||
| -rw-r--r-- | routers/admin/auths.go | 2 | ||||
| -rw-r--r-- | routers/admin/notice.go | 2 | ||||
| -rw-r--r-- | routers/admin/users.go | 4 | ||||
| -rw-r--r-- | routers/admin/users_test.go | 1 |
5 files changed, 8 insertions, 7 deletions
diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 8339c1eaec..54fbddc58e 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -13,9 +13,6 @@ import ( "strings" "time" - "github.com/Unknwon/com" - "gopkg.in/macaron.v1" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" @@ -25,6 +22,9 @@ import ( "code.gitea.io/gitea/modules/process" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" + + "gitea.com/macaron/macaron" + "github.com/unknwon/com" ) const ( diff --git a/routers/admin/auths.go b/routers/admin/auths.go index 81751f8955..8e0c27e226 100644 --- a/routers/admin/auths.go +++ b/routers/admin/auths.go @@ -16,7 +16,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" - "github.com/Unknwon/com" + "github.com/unknwon/com" "xorm.io/core" ) diff --git a/routers/admin/notice.go b/routers/admin/notice.go index d2c067c143..ad2bad2163 100644 --- a/routers/admin/notice.go +++ b/routers/admin/notice.go @@ -12,7 +12,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" - "github.com/Unknwon/com" + "github.com/unknwon/com" ) const ( diff --git a/routers/admin/users.go b/routers/admin/users.go index 8a99de01c2..aa595edad9 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -7,8 +7,6 @@ package admin import ( "strings" - "github.com/Unknwon/com" - "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/base" @@ -16,6 +14,8 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/routers" + + "github.com/unknwon/com" ) const ( diff --git a/routers/admin/users_test.go b/routers/admin/users_test.go index 17eadd1336..e054524fd1 100644 --- a/routers/admin/users_test.go +++ b/routers/admin/users_test.go @@ -10,6 +10,7 @@ import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/test" + "github.com/stretchr/testify/assert" ) |