Use gitea forked macaron (#7933)

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

8 files changed, 20 insertions, 17 deletions

diff --git a/modules/context/api.go b/modules/context/api.go
index 0b2f81fd64..024ae487f1 100644
--- a/modules/context/api.go
+++ b/modules/context/api.go
@@ -10,14 +10,13 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/go-macaron/csrf"
-
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"gopkg.in/macaron.v1"
+	"gitea.com/macaron/csrf"
+	"gitea.com/macaron/macaron"
 )
 
 // APIContext is a specific macaron context for API service
diff --git a/modules/context/auth.go b/modules/context/auth.go
index 772403bda9..be63720035 100644
--- a/modules/context/auth.go
+++ b/modules/context/auth.go
@@ -10,8 +10,9 @@ import (
 	"code.gitea.io/gitea/modules/auth"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
-	"github.com/go-macaron/csrf"
-	macaron "gopkg.in/macaron.v1"
+
+	"gitea.com/macaron/csrf"
+	"gitea.com/macaron/macaron"
 )
 
 // ToggleOptions contains required or check options
diff --git a/modules/context/context.go b/modules/context/context.go
index b7c77ac460..e89b2e25c4 100644
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -20,12 +20,13 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/util"
-	"github.com/Unknwon/com"
-	"github.com/go-macaron/cache"
-	"github.com/go-macaron/csrf"
-	"github.com/go-macaron/i18n"
-	"github.com/go-macaron/session"
-	"gopkg.in/macaron.v1"
+
+	"gitea.com/macaron/cache"
+	"gitea.com/macaron/csrf"
+	"gitea.com/macaron/i18n"
+	"gitea.com/macaron/macaron"
+	"gitea.com/macaron/session"
+	"github.com/unknwon/com"
 )
 
 // Context represents context of a request.
diff --git a/modules/context/org.go b/modules/context/org.go
index 12d5dbfbf9..4867474334 100644
--- a/modules/context/org.go
+++ b/modules/context/org.go
@@ -9,7 +9,8 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/setting"
-	macaron "gopkg.in/macaron.v1"
+
+	"gitea.com/macaron/macaron"
 )
 
 // Organization contains organization context
diff --git a/modules/context/pagination.go b/modules/context/pagination.go
index 390b4dbdd7..9a6ad0b5c4 100644
--- a/modules/context/pagination.go
+++ b/modules/context/pagination.go
@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/Unknwon/paginater"
+	"github.com/unknwon/paginater"
 )
 
 // Pagination provides a pagination via Paginater and additional configurations for the link params used in rendering
diff --git a/modules/context/panic.go b/modules/context/panic.go
index c251337164..e5ef233629 100644
--- a/modules/context/panic.go
+++ b/modules/context/panic.go
@@ -20,7 +20,8 @@ import (
 	"fmt"
 
 	"code.gitea.io/gitea/modules/log"
-	macaron "gopkg.in/macaron.v1"
+
+	"gitea.com/macaron/macaron"
 )
 
 // Recovery returns a middleware that recovers from any panics and writes a 500 and a log if so.
diff --git a/modules/context/permission.go b/modules/context/permission.go
index 6ac935686b..f2adf896f9 100644
--- a/modules/context/permission.go
+++ b/modules/context/permission.go
@@ -8,7 +8,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/log"
 
-	macaron "gopkg.in/macaron.v1"
+	"gitea.com/macaron/macaron"
 )
 
 // RequireRepoAdmin returns a macaron middleware for requiring repository admin permission
diff --git a/modules/context/repo.go b/modules/context/repo.go
index 096f3c0a5d..1499145f74 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -18,9 +18,9 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 
-	"github.com/Unknwon/com"
+	"gitea.com/macaron/macaron"
+	"github.com/unknwon/com"
 	"gopkg.in/editorconfig/editorconfig-core-go.v1"
-	"gopkg.in/macaron.v1"
 )
 
 // PullRequest contains informations to make a pull request