1
1
mirror of https://github.com/go-gitea/gitea synced 2025-07-23 10:48:37 +00:00

Use gitea forked macaron (#7933)

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

View File

@@ -23,7 +23,7 @@ import (
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/unknwon/com"
"xorm.io/builder"
)

View File

@@ -11,7 +11,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/unknwon/com"
)
//NoticeType describes the notice type

View File

@@ -14,7 +14,7 @@ import (
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"github.com/Unknwon/com"
"github.com/unknwon/com"
)
const (

View File

@@ -25,8 +25,9 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/setting"
"github.com/Unknwon/com"
"github.com/sergi/go-diff/diffmatchpatch"
"github.com/unknwon/com"
stdcharset "golang.org/x/net/html/charset"
"golang.org/x/text/transform"
)

View File

@@ -14,7 +14,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"github.com/Unknwon/com"
"github.com/unknwon/com"
)
// LocalCopyPath returns the local repository temporary copy path.

View File

@@ -19,8 +19,8 @@ import (
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
"xorm.io/builder"
)

View File

@@ -8,8 +8,8 @@ import (
"fmt"
"code.gitea.io/gitea/modules/log"
api "code.gitea.io/gitea/modules/structs"
"github.com/go-xorm/xorm"
)

View File

@@ -19,8 +19,8 @@ import (
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
"xorm.io/builder"
)

View File

@@ -11,9 +11,9 @@ import (
"strconv"
"strings"
"github.com/go-xorm/xorm"
api "code.gitea.io/gitea/modules/structs"
"github.com/go-xorm/xorm"
)
var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")

View File

@@ -8,11 +8,11 @@ package models
import (
"fmt"
"github.com/Unknwon/com"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/markup"
"code.gitea.io/gitea/modules/setting"
"github.com/unknwon/com"
)
func (issue *Issue) mailSubject() string {

View File

@@ -13,6 +13,7 @@ import (
"code.gitea.io/gitea/modules/log"
api "code.gitea.io/gitea/modules/structs"
"github.com/go-xorm/xorm"
)

View File

@@ -21,8 +21,8 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
"xorm.io/core"
)

View File

@@ -17,6 +17,7 @@ import (
"code.gitea.io/gitea/modules/markup/markdown"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil"
"gopkg.in/gomail.v2"
)

View File

@@ -17,14 +17,14 @@ import (
"strings"
"time"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
ini "gopkg.in/ini.v1"
"code.gitea.io/gitea/modules/generate"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"
"github.com/unknwon/com"
ini "gopkg.in/ini.v1"
)
const minDBVersion = 4

View File

@@ -9,8 +9,8 @@ import (
"fmt"
"strings"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
)
func ldapUseSSLToSecurityProtocol(x *xorm.Engine) error {

View File

@@ -13,8 +13,8 @@ import (
"code.gitea.io/gitea/modules/setting"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
)
func generateAndMigrateGitHooks(x *xorm.Engine) (err error) {

View File

@@ -11,8 +11,8 @@ import (
"code.gitea.io/gitea/modules/setting"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
)
const (

View File

@@ -13,8 +13,8 @@ import (
"code.gitea.io/gitea/modules/setting"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
)
func generateAndMigrateWikiGitHooks(x *xorm.Engine) (err error) {

View File

@@ -16,8 +16,8 @@ import (
"code.gitea.io/gitea/modules/setting"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
)
func generateAndMigrateGitHookChains(x *xorm.Engine) (err error) {

View File

@@ -8,6 +8,7 @@ import (
"fmt"
"code.gitea.io/gitea/models"
"github.com/go-xorm/xorm"
)

View File

@@ -15,10 +15,10 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/dgrijalva/jwt-go"
"github.com/go-xorm/xorm"
uuid "github.com/satori/go.uuid"
"github.com/unknwon/com"
"golang.org/x/crypto/bcrypt"
)

View File

@@ -14,8 +14,8 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/structs"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
"xorm.io/builder"
)

View File

@@ -25,8 +25,8 @@ import (
"code.gitea.io/gitea/modules/sync"
"code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
)
var pullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)

View File

@@ -36,8 +36,8 @@ import (
"code.gitea.io/gitea/modules/sync"
"code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
ini "gopkg.in/ini.v1"
"xorm.io/builder"
)

View File

@@ -20,9 +20,9 @@ import (
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/mcuadros/go-version"
"github.com/unknwon/com"
)
// MirrorQueue holds an UniqueQueue object of the mirror

View File

@@ -5,8 +5,9 @@
package models
import (
"code.gitea.io/gitea/modules/log"
"strings"
"code.gitea.io/gitea/modules/log"
)
// RepoRedirect represents that a repo name should be redirected to another

View File

@@ -14,8 +14,8 @@ import (
"code.gitea.io/gitea/modules/markup"
"github.com/Unknwon/com"
"github.com/stretchr/testify/assert"
"github.com/unknwon/com"
)
func TestRepo(t *testing.T) {

View File

@@ -9,8 +9,8 @@ import (
"code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
"xorm.io/core"
)

View File

@@ -28,8 +28,8 @@ import (
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
"golang.org/x/crypto/ssh"
"xorm.io/builder"
)

View File

@@ -17,9 +17,9 @@ import (
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/setting"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/stretchr/testify/assert"
"github.com/unknwon/com"
"gopkg.in/testfixtures.v2"
"xorm.io/core"
)

View File

@@ -12,10 +12,10 @@ import (
"os"
"path"
"github.com/Unknwon/com"
gouuid "github.com/satori/go.uuid"
"code.gitea.io/gitea/modules/setting"
gouuid "github.com/satori/go.uuid"
"github.com/unknwon/com"
)
// ____ ___ .__ .___ ___________.___.__

View File

@@ -32,8 +32,8 @@ import (
"code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"
"github.com/unknwon/com"
"golang.org/x/crypto/argon2"
"golang.org/x/crypto/bcrypt"
"golang.org/x/crypto/pbkdf2"

View File

@@ -25,8 +25,8 @@ import (
"code.gitea.io/gitea/modules/sync"
"code.gitea.io/gitea/modules/timeutil"
"github.com/Unknwon/com"
gouuid "github.com/satori/go.uuid"
"github.com/unknwon/com"
)
// HookQueue is a global queue of web hooks

View File

@@ -15,7 +15,7 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/sync"
"github.com/Unknwon/com"
"github.com/unknwon/com"
)
var (