summaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2015-10-15 21:28:12 -0400
committerUnknwon <u@gogs.io>2015-10-15 21:28:12 -0400
commit932dbccb6738b2894e4faafce4f834ef6803efc6 (patch)
tree14cd0a6cbce5906ce394491bd00e1f790be1dcc7 /routers
parenta749e6adcf97d21e8fd64cdf92de52a1ada68f6d (diff)
downloadgitea-932dbccb6738b2894e4faafce4f834ef6803efc6.tar.gz
gitea-932dbccb6738b2894e4faafce4f834ef6803efc6.zip
fix import path, fix #1782
Diffstat (limited to 'routers')
-rw-r--r--routers/admin/admin.go2
-rw-r--r--routers/install.go2
-rw-r--r--routers/user/auth.go2
-rw-r--r--routers/user/home.go2
4 files changed, 4 insertions, 4 deletions
diff --git a/routers/admin/admin.go b/routers/admin/admin.go
index 54d1a1450f..54e4559ff9 100644
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -11,7 +11,7 @@ import (
"time"
"github.com/Unknwon/com"
- "github.com/Unknwon/macaron"
+ "gopkg.in/macaron.v1"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/models/cron"
diff --git a/routers/install.go b/routers/install.go
index b252308011..4b22463ed5 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -13,9 +13,9 @@ import (
"strings"
"github.com/Unknwon/com"
- "github.com/Unknwon/macaron"
"github.com/go-xorm/xorm"
"gopkg.in/ini.v1"
+ "gopkg.in/macaron.v1"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/models/cron"
diff --git a/routers/user/auth.go b/routers/user/auth.go
index 8037f76fc1..54cbf4475e 100644
--- a/routers/user/auth.go
+++ b/routers/user/auth.go
@@ -7,7 +7,7 @@ package user
import (
"net/url"
- "github.com/macaron-contrib/captcha"
+ "github.com/go-macaron/captcha"
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
diff --git a/routers/user/home.go b/routers/user/home.go
index 8008889d49..581bb0633c 100644
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -299,7 +299,7 @@ func ShowSSHKeys(ctx *middleware.Context, uid int64) {
buf.WriteString(keys[i].OmitEmail())
buf.WriteString("\n")
}
- ctx.RenderData(200, buf.Bytes())
+ ctx.PlainText(200, buf.Bytes())
}
func Profile(ctx *middleware.Context) {