diff --git a/models/webhook.go b/models/webhook.go index bffddb359fe..4b5501715a0 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -76,7 +76,7 @@ type HookEvent struct { type HookStatus int const ( - HOOK_STATUS_NONE = iota + HookStatusNone = iota HookStatusSucceed HookStatusFail ) diff --git a/routers/repo/setting.go b/routers/repo/setting.go index eab02e52f1b..a97f8f71fc9 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -22,7 +22,7 @@ const ( SETTINGS_OPTIONS base.TplName = "repo/settings/options" COLLABORATION base.TplName = "repo/settings/collaboration" GITHOOKS base.TplName = "repo/settings/githooks" - GITHOOK_EDIT base.TplName = "repo/settings/githook_edit" + GithookEdit base.TplName = "repo/settings/githook_edit" DEPLOY_KEYS base.TplName = "repo/settings/deploy_keys" ) @@ -425,7 +425,7 @@ func GitHooksEdit(ctx *context.Context) { return } ctx.Data["Hook"] = hook - ctx.HTML(200, GITHOOK_EDIT) + ctx.HTML(200, GithookEdit) } func GitHooksEditPost(ctx *context.Context) { diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index c9d15bef087..918c34016f0 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -24,8 +24,8 @@ import ( const ( HOOKS base.TplName = "repo/settings/hooks" - HOOK_NEW base.TplName = "repo/settings/hook_new" - ORG_HOOK_NEW base.TplName = "org/settings/hook_new" + HookNew base.TplName = "repo/settings/hook_new" + ORG_HookNew base.TplName = "org/settings/hook_new" ) func Webhooks(ctx *context.Context) { @@ -57,7 +57,7 @@ func getOrgRepoCtx(ctx *context.Context) (*OrgRepoCtx, error) { return &OrgRepoCtx{ RepoID: ctx.Repo.Repository.ID, Link: ctx.Repo.RepoLink, - NewTemplate: HOOK_NEW, + NewTemplate: HookNew, }, nil } @@ -65,7 +65,7 @@ func getOrgRepoCtx(ctx *context.Context) (*OrgRepoCtx, error) { return &OrgRepoCtx{ OrgID: ctx.Org.Organization.ID, Link: ctx.Org.OrgLink, - NewTemplate: ORG_HOOK_NEW, + NewTemplate: ORG_HookNew, }, nil } diff --git a/vendor/github.com/go-gitea/git/hook.go b/vendor/github.com/go-gitea/git/hook.go index 20da99392ac..086bf7126d8 100644 --- a/vendor/github.com/go-gitea/git/hook.go +++ b/vendor/github.com/go-gitea/git/hook.go @@ -102,13 +102,13 @@ func ListHooks(repoPath string) (_ []*Hook, err error) { } const ( - HOOK_PATH_UPDATE = "hooks/update" + HookPathUpdate = "hooks/update" ) // SetUpdateHook writes given content to update hook of the reposiotry. func SetUpdateHook(repoPath, content string) (err error) { log("Setting update hook: %s", repoPath) - hookPath := path.Join(repoPath, HOOK_PATH_UPDATE) + hookPath := path.Join(repoPath, HookPathUpdate) if com.IsExist(hookPath) { err = os.Remove(hookPath) } else {