domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Merge branch 'dev' of https://github.com/gogits/gogs into dev

Browse source
This commit is contained in:
FuXiaoHei 2014-05-01 20:57:11 +08:00
commit cc1eb5643e
24 changed files with 56 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

1
routers/dev/template.go
View file

@ -21,5 +21,6 @@ func TemplatePreview(ctx *middleware.Context, params martini.Params) {
ctx.Data["Code"] = "2014031910370000009fff6782aadb2162b4a997acb69d4400888e0b9274657374"
ctx.Data["ActiveCodeLives"] = base.Service.ActiveCodeLives / 60
ctx.Data["ResetPwdCodeLives"] = base.Service.ResetPwdCodeLives / 60
ctx.Data["CurDbValue"] = ""
ctx.HTML(200, params["_1"])
}

1
routers/user/setting.go
View file

@ -54,6 +54,7 @@ func SettingPost(ctx *middleware.Context, form auth.UpdateProfileForm) {
user.Name = form.UserName
}
user.FullName = form.FullName
user.Email = form.Email
user.Website = form.Website
user.Location = form.Location