Merge branch 'master' of github.com:gogits/gogs

5 files changed, 49 insertions, 2 deletions

diff --git a/models/repo.go b/models/repo.go
index ff9090df..d5f9be72 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -261,6 +261,7 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
 		return err
 	}
 
+	/*
 	// hook/post-update
 	pu, err := os.OpenFile(filepath.Join(repoPath, "hooks", "post-update"), os.O_CREATE|os.O_WRONLY, 0777)
 	if err != nil {
@@ -282,6 +283,7 @@ func initRepository(f string, user *User, repo *Repository, initReadme bool, rep
 	if _, err = pu2.WriteString("#!/usr/bin/env bash\ngit update-server-info\n"); err != nil {
 		return err
 	}
+	*/
 
 	// Initialize repository according to user's choice.
 	fileName := map[string]string{}
diff --git a/public/css/gogs.css b/public/css/gogs.css
index ec37721f..434af035 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -711,6 +711,12 @@ html, body {
     width: 1%;
 }
 
+.file-content .file-body.file-code .lines-ellipsis {
+    background-color: #FAFAFA;
+    color: #999;
+    width: 1%;
+}
+
 .file-content .file-body.file-code .lines-num span {
     font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
     line-height: 1.6;
@@ -896,7 +902,7 @@ html, body {
     background-color: #e9aeae;
 }
 
-.diff-detail-box span.status.rename{
+.diff-detail-box span.status.rename {
     background-color: #dad8ff;
 }
 
@@ -962,6 +968,10 @@ html, body {
     border-color: #f0db88 !important;
 }
 
+.diff-file-box .ellipsis-code pre {
+    color: #AAA;
+}
+
 /* wrapper and footer */
 
 #wrapper {
diff --git a/serve.go b/serve.go
index 5b2f2e97..06815b65 100644
--- a/serve.go
+++ b/serve.go
@@ -44,6 +44,10 @@ gogs serv provide access auth for repositories`,
 	Flags:  []cli.Flag{},
 }
 
+func init() {
+	log.NewLogger(10000, "file", fmt.Sprintf(`{"filename":"%s"}`, "log/serv.log"))
+}
+
 func parseCmd(cmd string) (string, string) {
 	ss := strings.SplitN(cmd, " ", 2)
 	if len(ss) != 2 {
@@ -228,7 +232,7 @@ func runServ(k *cli.Context) {
 			return
 		}
 		if ref, ok = refs[refname]; !ok {
-			println("unknow reference name -", refname, "-")
+			log.Trace("unknow reference name -", refname, "-", b.String())
 			return
 		}
 		l, err = ref.AllCommits()
diff --git a/templates/repo/diff.tmpl b/templates/repo/diff.tmpl
index 0c6f4feb..b0836127 100644
--- a/templates/repo/diff.tmpl
+++ b/templates/repo/diff.tmpl
@@ -387,6 +387,36 @@
                             <pre>	"github.com/youtube/vitess/go/bson"</pre>
                         </td>
                     </tr>
+                    <tr class="ellipsis-code">
+                        <td class="text-center lines-ellipsis" colspan="2">
+                            <i class="fa fa-ellipsis-h"></i>
+                        </td>
+                        <td class="lines-code">
+                            <pre>	"github.com/youtube/vitess/go/bson"</pre>
+                        </td>
+                    </tr>
+                    <tr class="same-code nl-8 ol-10">
+                        <td class="lines-num lines-num-old">
+                            <span rel="L1">10</span>
+                        </td>
+                        <td class="lines-num lines-num-new">
+                            <span rel="L1">8</span>
+                        </td>
+                        <td class="lines-code">
+                            <pre>	"github.com/youtube/vitess/go/bson"</pre>
+                        </td>
+                    </tr>
+                    <tr class="same-code nl-8 ol-10">
+                        <td class="lines-num lines-num-old">
+                            <span rel="L1">10</span>
+                        </td>
+                        <td class="lines-num lines-num-new">
+                            <span rel="L1">8</span>
+                        </td>
+                        <td class="lines-code">
+                            <pre>	"github.com/youtube/vitess/go/bson"</pre>
+                        </td>
+                    </tr>
                     </tbody>
                 </table>
             </div>
diff --git a/templates/repo/single_file.tmpl b/templates/repo/single_file.tmpl
index 40ef44eb..2a28f0b5 100644
--- a/templates/repo/single_file.tmpl
+++ b/templates/repo/single_file.tmpl
@@ -5,6 +5,7 @@
         {{else}}
             <i class="icon fa fa-file-text-o"></i>
         {{end}}{{.FileName}}
+        <a class="btn btn-default pull-right" href="#">Raw</a>
     </div>
     {{if .FileIsLarge}}
         <div class="panel-footer">