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/user | |
| 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/user')
| -rw-r--r-- | routers/user/auth.go | 2 | ||||
| -rw-r--r-- | routers/user/auth_openid.go | 2 | ||||
| -rw-r--r-- | routers/user/home.go | 2 | ||||
| -rw-r--r-- | routers/user/home_test.go | 2 | ||||
| -rw-r--r-- | routers/user/oauth.go | 2 | ||||
| -rw-r--r-- | routers/user/setting/profile.go | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/routers/user/auth.go b/routers/user/auth.go index 6850bbe11b..11d642b147 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -22,7 +22,7 @@ import ( "code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/util" - "github.com/go-macaron/captcha" + "gitea.com/macaron/captcha" "github.com/markbates/goth" "github.com/tstranex/u2f" ) diff --git a/routers/user/auth_openid.go b/routers/user/auth_openid.go index 48dbf02ffb..832766b16c 100644 --- a/routers/user/auth_openid.go +++ b/routers/user/auth_openid.go @@ -19,7 +19,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" - "github.com/go-macaron/captcha" + "gitea.com/macaron/captcha" ) const ( diff --git a/routers/user/home.go b/routers/user/home.go index 9ccd5bdb26..adf47d289c 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -18,9 +18,9 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/util" - "github.com/Unknwon/com" "github.com/keybase/go-crypto/openpgp" "github.com/keybase/go-crypto/openpgp/armor" + "github.com/unknwon/com" ) const ( diff --git a/routers/user/home_test.go b/routers/user/home_test.go index 8a3d9b9f51..9d4136ac8c 100644 --- a/routers/user/home_test.go +++ b/routers/user/home_test.go @@ -9,9 +9,9 @@ import ( "testing" "code.gitea.io/gitea/models" + "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/test" - "code.gitea.io/gitea/modules/setting" "github.com/stretchr/testify/assert" ) diff --git a/routers/user/oauth.go b/routers/user/oauth.go index 19add5e647..d4dcb857fa 100644 --- a/routers/user/oauth.go +++ b/routers/user/oauth.go @@ -18,8 +18,8 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/timeutil" + "gitea.com/macaron/binding" "github.com/dgrijalva/jwt-go" - "github.com/go-macaron/binding" ) const ( diff --git a/routers/user/setting/profile.go b/routers/user/setting/profile.go index 64828e90ee..6db9fc7c6e 100644 --- a/routers/user/setting/profile.go +++ b/routers/user/setting/profile.go @@ -18,8 +18,8 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" - "github.com/Unknwon/com" - "github.com/Unknwon/i18n" + "github.com/unknwon/com" + "github.com/unknwon/i18n" ) const ( |