Fix diff css style, hooks \r char

tokarchuk/v1.17
Unknwon 10 years ago
parent 963354c5d7
commit 3005c4f6db
  1. 2
      modules/git/hooks.go
  2. 2
      templates/repo/diff.tmpl

@ -83,7 +83,7 @@ func (h *Hook) Update() error {
if len(strings.TrimSpace(h.Content)) == 0 { if len(strings.TrimSpace(h.Content)) == 0 {
return os.Remove(h.path) return os.Remove(h.path)
} }
return ioutil.WriteFile(h.path, []byte(h.Content), os.ModePerm) return ioutil.WriteFile(h.path, []byte(strings.Replace(h.Content, "\r", "", -1)), os.ModePerm)
} }
// ListHooks returns a list of Git hooks of given repository. // ListHooks returns a list of Git hooks of given repository.

@ -74,7 +74,7 @@
</div> </div>
{{range .Diff.Files}} {{range .Diff.Files}}
<div class="panel diff-file-box diff-box file-content" id="diff-{{.Index}}"> <div class="panel panel-radius diff-file-box diff-box file-content" id="diff-{{.Index}}">
<div class="panel-header"> <div class="panel-header">
<div class="diff-counter count pull-left"> <div class="diff-counter count pull-left">
{{if not .IsBin}} {{if not .IsBin}}

Loading…
Cancel
Save