diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-11-17 14:53:41 -0500 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-11-17 14:53:41 -0500 |
| commit | 32dcaefafa6039e8fe27d263290e33ce5e5d3aa5 (patch) | |
| tree | 689cfa7791c40b3d25a801c7b7cc3bf07f23ed7f /routers | |
| parent | d1a60e364383b877fd98b853d94b739cb171fe9c (diff) | |
| download | gitea-32dcaefafa6039e8fe27d263290e33ce5e5d3aa5.tar.gz gitea-32dcaefafa6039e8fe27d263290e33ce5e5d3aa5.zip | |
fox #620
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/admin/users.go | 3 | ||||
| -rw-r--r-- | routers/repo/http.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/routers/admin/users.go b/routers/admin/users.go index ac33fd62b1..0a1056f3bd 100644 --- a/routers/admin/users.go +++ b/routers/admin/users.go @@ -174,7 +174,7 @@ func EditUserPost(ctx *middleware.Context, form auth.AdminEditUserForm) { return } - // NOTE: need password length check? + // FIXME: need password length check if len(form.Passwd) > 0 { u.Passwd = form.Passwd u.Salt = models.GetUserSalt() @@ -191,6 +191,7 @@ func EditUserPost(ctx *middleware.Context, form auth.AdminEditUserForm) { u.AvatarEmail = form.Avatar u.IsActive = form.Active u.IsAdmin = form.Admin + u.AllowGitHook = form.AllowGitHook if err := models.UpdateUser(u); err != nil { ctx.Handle(500, "UpdateUser", err) return diff --git a/routers/repo/http.go b/routers/repo/http.go index 0ce83cef4d..2dc66449da 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -14,9 +14,9 @@ import ( "os" "os/exec" "path" - "path/filepath" "regexp" + "runtime" "strconv" "strings" "time" @@ -184,6 +184,7 @@ func Http(ctx *middleware.Context) { handler := HttpBackend(&config) handler(ctx.Resp, ctx.Req.Request) + runtime.GC() } type route struct { |