Use gitea forked macaron (#7933)

Signed-off-by: Tamal Saha <tamal@appscode.com>

models/action.go

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

models/admin.go

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

models/branches.go

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

models/git_diff.go

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

models/helper_directory.go

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

models/issue.go

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

models/issue_assignees.go

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

models/issue_comment.go

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

models/issue_label.go

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

models/issue_mail.go

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

models/lfs_lock.go

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

models/login_source.go

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

models/mail.go

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

models/migrations/migrations.go

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

models/migrations/v13.go

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

models/migrations/v19.go

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

models/migrations/v21.go

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

models/migrations/v22.go

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

models/migrations/v26.go

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

models/migrations/v55.go

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

models/oauth2_application.go

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

models/org.go

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

models/pull.go

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

models/repo.go

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

models/repo_mirror.go

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

models/repo_redirect.go

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

models/repo_test.go

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

models/repo_unit.go

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

models/ssh_key.go

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

models/unit_tests.go

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

models/upload.go

@@ -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"
 )
 
 //  ____ ___        .__                    .___ ___________.___.__

models/user.go

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

models/webhook.go

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

models/wiki.go

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