diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/auth/admin.go | 17 | ||||
| -rw-r--r-- | modules/middleware/repo.go | 2 | ||||
| -rw-r--r-- | modules/setting/setting.go | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/modules/auth/admin.go b/modules/auth/admin.go index 60ea3a3c..6fec6ce7 100644 --- a/modules/auth/admin.go +++ b/modules/auth/admin.go @@ -11,14 +11,15 @@ import ( ) type AdminEditUserForm struct { - Email string `form:"email" binding:"Required;Email;MaxSize(50)"` - Passwd string `form:"password"` - Website string `form:"website" binding:"MaxSize(50)"` - Location string `form:"location" binding:"MaxSize(50)"` - Avatar string `form:"avatar" binding:"Required;Email;MaxSize(50)"` - Active bool `form:"active"` - Admin bool `form:"admin"` - LoginType int `form:"login_type"` + Email string `form:"email" binding:"Required;Email;MaxSize(50)"` + Passwd string `form:"password"` + Website string `form:"website" binding:"MaxSize(50)"` + Location string `form:"location" binding:"MaxSize(50)"` + Avatar string `form:"avatar" binding:"Required;Email;MaxSize(50)"` + Active bool `form:"active"` + Admin bool `form:"admin"` + AllowGitHook bool `form:"allow_git_hook"` + LoginType int `form:"login_type"` } func (f *AdminEditUserForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors { diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index 2d311d21..0aae122d 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -454,7 +454,7 @@ func RequireTrueOwner() macaron.Handler { // GitHookService checks if repsitory Git hooks service has been enabled. func GitHookService() macaron.Handler { return func(ctx *Context) { - if !setting.Service.EnableGitHooks { + if !ctx.User.AllowGitHook && !ctx.User.IsAdmin { ctx.Handle(404, "GitHookService", nil) return } diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 6b1b9fed..0f293b69 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -285,7 +285,6 @@ var Service struct { LdapAuth bool ActiveCodeLives int ResetPwdCodeLives int - EnableGitHooks bool } func newService() { @@ -295,7 +294,6 @@ func newService() { Service.RequireSignInView = Cfg.MustBool("service", "REQUIRE_SIGNIN_VIEW") Service.EnableCacheAvatar = Cfg.MustBool("service", "ENABLE_CACHE_AVATAR") Service.EnableReverseProxyAuth = Cfg.MustBool("service", "ENABLE_REVERSE_PROXY_AUTHENTICATION") - Service.EnableGitHooks = Cfg.MustBool("service", "ENABLE_GIT_HOOKS") } var logLevels = map[string]string{ |