From 7de71333c655722c35a3e3e25e7769c0b292e27c Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 19 Feb 2017 13:18:16 -0500 Subject: repo: several minor improvements 1. Fix sample content didn't show up when hook doesn't exist. 2. Fix CSS 'word-break' to use 'break-word' not 'break-all'. 3. Fix single quote in 'locale_en-US.ini' file. --- vendor/github.com/gogits/git-module/hook.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'vendor/github.com/gogits/git-module/hook.go') diff --git a/vendor/github.com/gogits/git-module/hook.go b/vendor/github.com/gogits/git-module/hook.go index 6ba66be0..a0d0b16b 100644 --- a/vendor/github.com/gogits/git-module/hook.go +++ b/vendor/github.com/gogits/git-module/hook.go @@ -13,8 +13,9 @@ import ( ) var ( - // Direcotry of hook file. Can be changed to "custom_hooks" for very purpose. - HookDir = "hooks" + // Direcotry of hook and sample files. Can be changed to "custom_hooks" for very purpose. + HookDir = "hooks" + HookSampleDir = HookDir // HookNames is a list of Git server hooks' name that are supported. HookNames = []string{ "pre-receive", @@ -62,8 +63,13 @@ func GetHook(repoPath, name string) (*Hook, error) { } h.IsActive = true h.Content = string(data) - } else if isFile(h.path + ".sample") { - data, err := ioutil.ReadFile(h.path + ".sample") + return h, nil + } + + // Check sample file + samplePath := path.Join(repoPath, HookSampleDir, h.name) + ".sample" + if isFile(samplePath) { + data, err := ioutil.ReadFile(samplePath) if err != nil { return nil, err } -- cgit v1.2.3