Merge branch 'develop' of github.com:gogits/gogs into feature/page_issues

3 files changed, 2 insertions, 1 deletions

diff --git a/routers/admin/users.go b/routers/admin/users.go
index ddcca6390e..12c52236f9 100644
--- a/routers/admin/users.go
+++ b/routers/admin/users.go
@@ -185,6 +185,7 @@ func EditUserPost(ctx *middleware.Context, form auth.AdminEditUserForm) {
 		u.EncodePasswd()
 	}
 
+	u.FullName = form.FullName
 	u.Email = form.Email
 	u.Website = form.Website
 	u.Location = form.Location
diff --git a/routers/repo/download.go b/routers/repo/download.go
index c5e18e005b..b1c5fbc84d 100644
--- a/routers/repo/download.go
+++ b/routers/repo/download.go
@@ -27,7 +27,6 @@ func ServeBlob(ctx *middleware.Context, blob *git.Blob) error {
 
 	_, isTextFile := base.IsTextFile(buf)
 	_, isImageFile := base.IsImageFile(buf)
-	ctx.Resp.Header().Set("Content-Type", "text/plain")
 	if !isTextFile && !isImageFile {
 		ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+path.Base(ctx.Repo.TreeName))
 		ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
diff --git a/routers/user/home.go b/routers/user/home.go
index 3484e78050..ef05be27a3 100644
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -152,6 +152,7 @@ func ShowSSHKeys(ctx *middleware.Context, uid int64) {
 	var buf bytes.Buffer
 	for i := range keys {
 		buf.WriteString(keys[i].OmitEmail())
+		buf.WriteString("\n")
 	}
 	ctx.RenderData(200, buf.Bytes())
 }