diff options
| author | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-05-01 20:57:11 +0800 |
|---|---|---|
| committer | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-05-01 20:57:11 +0800 |
| commit | cc1eb5643e3d28b6e23d3642bdf93670c33fa9c5 (patch) | |
| tree | 7adfbed18647baf9d3e281b7f23c0dcd0828cc7d /routers | |
| parent | 52fbb9788aa80adb56c96389f73c878cc0fe8b42 (diff) | |
| parent | a2333d95d594a6aa4e77e78c2efe32991d3cf1ef (diff) | |
| download | gitea-cc1eb5643e3d28b6e23d3642bdf93670c33fa9c5.tar.gz gitea-cc1eb5643e3d28b6e23d3642bdf93670c33fa9c5.zip | |
Merge branch 'dev' of https://github.com/gogits/gogs into dev
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/dev/template.go | 1 | ||||
| -rw-r--r-- | routers/user/setting.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/routers/dev/template.go b/routers/dev/template.go index 63d5d9a5bb..7145bf51fa 100644 --- a/routers/dev/template.go +++ b/routers/dev/template.go @@ -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"]) } diff --git a/routers/user/setting.go b/routers/user/setting.go index a55e617f44..f62e931051 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -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 |