domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Use gitea forked macaron (#7933)

Browse source 
Signed-off-by: Tamal Saha <tamal@appscode.com>
This commit is contained in:
Tamal Saha 2019-08-23 09:40:30 -07:00 • committed by techknowlogick
parent ca6fb004ac
commit 171b359877
408 changed files with 14882 additions and 13217 deletions
Download patch file Download diff file Expand all files Collapse all files

2
routers/user/auth.go
View file

@ -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"
)

2
routers/user/auth_openid.go
View file

@ -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 (

2
routers/user/home.go
View file

@ -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 (

2
routers/user/home_test.go
View file

@ -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"
)

2
routers/user/oauth.go
View file

@ -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 (

4
routers/user/setting/profile.go
View file

@ -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 (