aboutsummaryrefslogtreecommitdiff
path: root/routers
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2014-03-11 12:18:56 +0800
committerLunny Xiao <xiaolunwen@gmail.com>2014-03-11 12:18:56 +0800
commit5b5d54621e6b17e65e1df9227ca1bd5a66ce86db (patch)
treea2f429c224d0eb3356a6b456ac8fbca0860d3b49 /routers
parentf9907bbfa4368be7412ab3ade6be354225409652 (diff)
parent295cfd42aa7a3248c044abdc530a96b722fb5e6b (diff)
Merge branch 'master' of github.com:gogits/gogs
Diffstat (limited to 'routers')
-rw-r--r--routers/user/setting.go1
-rw-r--r--routers/user/user.go2
2 files changed, 2 insertions, 1 deletions
diff --git a/routers/user/setting.go b/routers/user/setting.go
index 96a02b6f..0669784b 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -56,6 +56,7 @@ func SettingSSHKeys(form auth.AddSSHKeyForm, r render.Render, data base.TmplData
"ok": true,
})
}
+ return
}
// Add new SSH key.
diff --git a/routers/user/user.go b/routers/user/user.go
index 51a84400..ca9dddae 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -134,7 +134,7 @@ func SignUp(form auth.RegisterForm, data base.TmplData, req *http.Request, r ren
// TODO: unfinished
func Delete(data base.TmplData, req *http.Request, r render.Render) {
- data["Title"] = "Delete user"
+ data["Title"] = "Delete Account"
if req.Method == "GET" {
r.HTML(200, "user/delete", data)