5 files changed, 12 insertions, 18 deletions
diff --git a/modules/context/api.go b/modules/context/api.go
index 62be56d320..dfd9a57818 100644
--- a/modules/context/api.go
+++ b/modules/context/api.go
@@ -9,11 +9,10 @@ import (
 	"strings"
 
 	"github.com/Unknwon/paginater"
-	"gopkg.in/macaron.v1"
-
 	"github.com/go-gitea/gitea/modules/base"
 	"github.com/go-gitea/gitea/modules/log"
 	"github.com/go-gitea/gitea/modules/setting"
+	macaron "gopkg.in/macaron.v1"
 )
 
 type APIContext struct {
diff --git a/modules/context/auth.go b/modules/context/auth.go
index 807183e452..8ed8162de7 100644
--- a/modules/context/auth.go
+++ b/modules/context/auth.go
@@ -7,11 +7,10 @@ package context
 import (
 	"net/url"
 
-	"github.com/go-macaron/csrf"
-	"gopkg.in/macaron.v1"
-
 	"github.com/go-gitea/gitea/modules/auth"
 	"github.com/go-gitea/gitea/modules/setting"
+	"github.com/go-macaron/csrf"
+	macaron "gopkg.in/macaron.v1"
 )
 
 type ToggleOptions struct {
diff --git a/modules/context/context.go b/modules/context/context.go
index 82e3cbf27b..9395880d02 100644
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -12,17 +12,16 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-macaron/cache"
-	"github.com/go-macaron/csrf"
-	"github.com/go-macaron/i18n"
-	"github.com/go-macaron/session"
-	"gopkg.in/macaron.v1"
-
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/auth"
 	"github.com/go-gitea/gitea/modules/base"
 	"github.com/go-gitea/gitea/modules/log"
 	"github.com/go-gitea/gitea/modules/setting"
+	"github.com/go-macaron/cache"
+	"github.com/go-macaron/csrf"
+	"github.com/go-macaron/i18n"
+	"github.com/go-macaron/session"
+	macaron "gopkg.in/macaron.v1"
 )
 
 // Context represents context of a request.
diff --git a/modules/context/org.go b/modules/context/org.go
index 880554a4b1..3804e210e6 100644
--- a/modules/context/org.go
+++ b/modules/context/org.go
@@ -7,10 +7,9 @@ package context
 import (
 	"strings"
 
-	"gopkg.in/macaron.v1"
-
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/setting"
+	macaron "gopkg.in/macaron.v1"
 )
 
 type Organization struct {
diff --git a/modules/context/repo.go b/modules/context/repo.go
index e4c2c597c5..82662b00de 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -11,14 +11,12 @@ import (
 	"strings"
 
 	"github.com/Unknwon/com"
-	"gopkg.in/editorconfig/editorconfig-core-go.v1"
-	"gopkg.in/macaron.v1"
-
-	"github.com/gogits/git-module"
-
 	"github.com/go-gitea/gitea/models"
 	"github.com/go-gitea/gitea/modules/log"
 	"github.com/go-gitea/gitea/modules/setting"
+	git "github.com/gogits/git-module"
+	editorconfig "gopkg.in/editorconfig/editorconfig-core-go.v1"
+	macaron "gopkg.in/macaron.v1"
 )
 
 type PullRequest struct {