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

5
modules/auth/admin.go
View file

@ -5,9 +5,8 @@
package auth
import (
"gopkg.in/macaron.v1"
"github.com/go-macaron/binding"
"gitea.com/macaron/binding"
"gitea.com/macaron/macaron"
)
// AdminCreateUserForm form for admin to create user

12
modules/auth/auth.go
View file

@ -10,18 +10,18 @@ import (
"strings"
"time"
"github.com/Unknwon/com"
"github.com/go-macaron/binding"
"github.com/go-macaron/session"
gouuid "github.com/satori/go.uuid"
"gopkg.in/macaron.v1"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/validation"
"gitea.com/macaron/binding"
"gitea.com/macaron/macaron"
"gitea.com/macaron/session"
gouuid "github.com/satori/go.uuid"
"github.com/unknwon/com"
)
// IsAPIPath if URL is an api path

4
modules/auth/auth_form.go
View file

@ -5,8 +5,8 @@
package auth
import (
"github.com/go-macaron/binding"
"gopkg.in/macaron.v1"
"gitea.com/macaron/binding"
"gitea.com/macaron/macaron"
)
// AuthenticationForm form for authentication

3
modules/auth/openid/openid.go
View file

@ -5,8 +5,9 @@
package openid
import (
"github.com/yohcop/openid-go"
"time"
"github.com/yohcop/openid-go"
)
// For the demo, we use in-memory infinite storage nonce and discovery

4
modules/auth/org.go
View file

@ -9,8 +9,8 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/structs"
"github.com/go-macaron/binding"
"gopkg.in/macaron.v1"
"gitea.com/macaron/binding"
"gitea.com/macaron/macaron"
)
// ________ .__ __ .__

4
modules/auth/repo_branch_form.go
View file

@ -5,8 +5,8 @@
package auth
import (
"github.com/go-macaron/binding"
macaron "gopkg.in/macaron.v1"
"gitea.com/macaron/binding"
"gitea.com/macaron/macaron"
)
// NewBranchForm form for creating a new branch

6
modules/auth/repo_form.go
View file

@ -13,9 +13,9 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/routers/utils"
"github.com/Unknwon/com"
"github.com/go-macaron/binding"
macaron "gopkg.in/macaron.v1"
"gitea.com/macaron/binding"
"gitea.com/macaron/macaron"
"github.com/unknwon/com"
)
// _______________________________________ _________.______________________ _______________.___.

1
modules/auth/repo_form_test.go
View file

@ -8,6 +8,7 @@ import (
"testing"
"code.gitea.io/gitea/modules/setting"
"github.com/stretchr/testify/assert"
)

4
modules/auth/user_form.go
View file

@ -11,8 +11,8 @@ import (
"code.gitea.io/gitea/modules/setting"
"github.com/go-macaron/binding"
macaron "gopkg.in/macaron.v1"
"gitea.com/macaron/binding"
"gitea.com/macaron/macaron"
)
// InstallForm form for installation page

4
modules/auth/user_form_auth_openid.go
View file

@ -5,8 +5,8 @@
package auth
import (
"github.com/go-macaron/binding"
"gopkg.in/macaron.v1"
"gitea.com/macaron/binding"
"gitea.com/macaron/macaron"
)
// SignInOpenIDForm form for signing in with OpenID