13 files changed, 27 insertions, 27 deletions
diff --git a/modules/auth/admin.go b/modules/auth/admin.go
index a4aa67ff9b..c2d47a44fd 100644
--- a/modules/auth/admin.go
+++ b/modules/auth/admin.go
@@ -5,9 +5,9 @@
 package auth
 
 import (
-	"github.com/Unknwon/macaron"
+	"gopkg.in/macaron.v1"
 
-	"github.com/macaron-contrib/binding"
+	"github.com/go-macaron/binding"
 )
 
 type AdminCrateUserForm struct {
diff --git a/modules/auth/apiv1/miscellaneous.go b/modules/auth/apiv1/miscellaneous.go
index e05b48381f..5032f0ac71 100644
--- a/modules/auth/apiv1/miscellaneous.go
+++ b/modules/auth/apiv1/miscellaneous.go
@@ -7,8 +7,8 @@ package apiv1
 import (
 	"reflect"
 
-	"github.com/Unknwon/macaron"
-	"github.com/macaron-contrib/binding"
+	"github.com/go-macaron/binding"
+	"gopkg.in/macaron.v1"
 
 	"github.com/gogits/gogs/modules/auth"
 )
diff --git a/modules/auth/auth.go b/modules/auth/auth.go
index ecae5b06b0..f144899b3c 100644
--- a/modules/auth/auth.go
+++ b/modules/auth/auth.go
@@ -10,9 +10,9 @@ import (
 	"time"
 
 	"github.com/Unknwon/com"
-	"github.com/Unknwon/macaron"
-	"github.com/macaron-contrib/binding"
-	"github.com/macaron-contrib/session"
+	"github.com/go-macaron/binding"
+	"github.com/go-macaron/session"
+	"gopkg.in/macaron.v1"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
diff --git a/modules/auth/auth_form.go b/modules/auth/auth_form.go
index 7ac47fcc3a..6f356344da 100644
--- a/modules/auth/auth_form.go
+++ b/modules/auth/auth_form.go
@@ -5,8 +5,8 @@
 package auth
 
 import (
-	"github.com/Unknwon/macaron"
-	"github.com/macaron-contrib/binding"
+	"github.com/go-macaron/binding"
+	"gopkg.in/macaron.v1"
 )
 
 type AuthenticationForm struct {
diff --git a/modules/auth/org.go b/modules/auth/org.go
index 6d9a7269ec..0642d1cb7c 100644
--- a/modules/auth/org.go
+++ b/modules/auth/org.go
@@ -5,8 +5,8 @@
 package auth
 
 import (
-	"github.com/Unknwon/macaron"
-	"github.com/macaron-contrib/binding"
+	"github.com/go-macaron/binding"
+	"gopkg.in/macaron.v1"
 )
 
 // ________                            .__                __  .__
diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go
index 3a74bbe000..ac43ba5d96 100644
--- a/modules/auth/repo_form.go
+++ b/modules/auth/repo_form.go
@@ -5,8 +5,8 @@
 package auth
 
 import (
-	"github.com/Unknwon/macaron"
-	"github.com/macaron-contrib/binding"
+	"github.com/go-macaron/binding"
+	"gopkg.in/macaron.v1"
 )
 
 // _______________________________________    _________.______________________ _______________.___.
diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go
index 53f5fb15c6..88d6dd9fba 100644
--- a/modules/auth/user_form.go
+++ b/modules/auth/user_form.go
@@ -7,8 +7,8 @@ package auth
 import (
 	"mime/multipart"
 
-	"github.com/Unknwon/macaron"
-	"github.com/macaron-contrib/binding"
+	"github.com/go-macaron/binding"
+	"gopkg.in/macaron.v1"
 )
 
 type InstallForm struct {
diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go
index ccec7544a0..680a3c483e 100644
--- a/modules/mailer/mail.go
+++ b/modules/mailer/mail.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"path"
 
-	"github.com/Unknwon/macaron"
+	"gopkg.in/macaron.v1"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index be8db35733..823e457af6 100644
--- a/modules/middleware/auth.go
+++ b/modules/middleware/auth.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"net/url"
 
-	"github.com/Unknwon/macaron"
-	"github.com/macaron-contrib/csrf"
+	"github.com/go-macaron/csrf"
+	"gopkg.in/macaron.v1"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index c08f84925e..dffebe6f2b 100644
--- a/modules/middleware/context.go
+++ b/modules/middleware/context.go
@@ -12,11 +12,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Unknwon/macaron"
-	"github.com/macaron-contrib/cache"
-	"github.com/macaron-contrib/csrf"
-	"github.com/macaron-contrib/i18n"
-	"github.com/macaron-contrib/session"
+	"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/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/auth"
@@ -154,7 +154,7 @@ func (ctx *Context) HandleText(status int, title string) {
 	if (status/100 == 4) || (status/100 == 5) {
 		log.Error(4, "%s", title)
 	}
-	ctx.RenderData(status, []byte(title))
+	ctx.PlainText(status, []byte(title))
 }
 
 // APIError logs error with title if status is 500.
diff --git a/modules/middleware/org.go b/modules/middleware/org.go
index 065e1b1e92..1e7d4a6797 100644
--- a/modules/middleware/org.go
+++ b/modules/middleware/org.go
@@ -5,7 +5,7 @@
 package middleware
 
 import (
-	"github.com/Unknwon/macaron"
+	"gopkg.in/macaron.v1"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/log"
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 0b519a6bdb..ba7cbac821 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -9,9 +9,9 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/Unknwon/macaron"
 	"github.com/mcuadros/go-version"
 	"github.com/mssola/user_agent"
+	"gopkg.in/macaron.v1"
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/git"
diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index b817f10bc2..6b5a365980 100644
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -18,7 +18,7 @@ import (
 	"gopkg.in/ini.v1"
 
 	"github.com/Unknwon/com"
-	"github.com/macaron-contrib/session"
+	"github.com/go-macaron/session"
 
 	"github.com/gogits/gogs/modules/bindata"
 	"github.com/gogits/gogs/modules/log"