Use gitea forked macaron (#7933)

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

7 files changed, 11 insertions, 10 deletions

diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 9ffcfb4df2..fc086bfd46 100644
--- a/models/migrations/migrations.go
+++ b/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
diff --git a/models/migrations/v13.go b/models/migrations/v13.go
index f81271f981..8b6b38cadf 100644
--- a/models/migrations/v13.go
+++ b/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 {
diff --git a/models/migrations/v19.go b/models/migrations/v19.go
index 44338eb8ba..9793f405ad 100644
--- a/models/migrations/v19.go
+++ b/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) {
diff --git a/models/migrations/v21.go b/models/migrations/v21.go
index 890f4de227..65cae2ac03 100644
--- a/models/migrations/v21.go
+++ b/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 (
diff --git a/models/migrations/v22.go b/models/migrations/v22.go
index 7774f6fd9a..f991ae25fa 100644
--- a/models/migrations/v22.go
+++ b/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) {
diff --git a/models/migrations/v26.go b/models/migrations/v26.go
index 636d1f76ca..3d88c62923 100644
--- a/models/migrations/v26.go
+++ b/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) {
diff --git a/models/migrations/v55.go b/models/migrations/v55.go
index 32f4e8ac04..c20c51616e 100644
--- a/models/migrations/v55.go
+++ b/models/migrations/v55.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 
 	"code.gitea.io/gitea/models"
+
 	"github.com/go-xorm/xorm"
 )