Merge branch 'master' of localhost:xiaoxiao/gogs4

Conflicts: .gitignore
2014-03-25 17:28:02 +08:00 · 2014-03-25 17:28:02 +08:00 · c0649c861c
commit c0649c861c
parent fcbe7ef5c1 649bc91057
1 changed files with 3 additions and 0 deletions
--- a/serve.go
+++ b/serve.go
@ -13,6 +13,7 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
+	"time"

 	"github.com/codegangsta/cli"
 	"github.com/gogits/gogs/modules/log"
@ -205,6 +206,8 @@ func runServ(k *cli.Context) {
 		return
 	}

+	time.Sleep(time.Second)
+
 	// find push reference name
 	var t = "ok refs/heads/"
 	var i int