summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/git/hooks.go2
-rw-r--r--templates/repo/diff.tmpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/git/hooks.go b/modules/git/hooks.go
index b8d15e5e75..5b3c88a931 100644
--- a/modules/git/hooks.go
+++ b/modules/git/hooks.go
@@ -83,7 +83,7 @@ func (h *Hook) Update() error {
if len(strings.TrimSpace(h.Content)) == 0 {
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.
diff --git a/templates/repo/diff.tmpl b/templates/repo/diff.tmpl
index 30a983ac90..9dac1cac97 100644
--- a/templates/repo/diff.tmpl
+++ b/templates/repo/diff.tmpl
@@ -74,7 +74,7 @@
</div>
{{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="diff-counter count pull-left">
{{if not .IsBin}}