Merge branch 'master' of github.com:gogits/gogs

This commit is contained in:
Lunny Xiao 2014-03-11 12:18:56 +08:00
commit 5b5d54621e
11 changed files with 54 additions and 35 deletions

View file

@ -56,6 +56,7 @@ func SettingSSHKeys(form auth.AddSSHKeyForm, r render.Render, data base.TmplData
"ok": true,
})
}
return
}
// Add new SSH key.

View file

@ -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)