mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-03 21:08:25 +00:00 
			
		
		
		
	Merge branch 'master' of localhost:xiaoxiao/gogs4
Conflicts: .gitignore
This commit is contained in:
		
							
								
								
									
										3
									
								
								serve.go
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								serve.go
									
									
									
									
									
								
							@@ -13,6 +13,7 @@ import (
 | 
				
			|||||||
	"os/exec"
 | 
						"os/exec"
 | 
				
			||||||
	"strconv"
 | 
						"strconv"
 | 
				
			||||||
	"strings"
 | 
						"strings"
 | 
				
			||||||
 | 
						"time"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	"github.com/codegangsta/cli"
 | 
						"github.com/codegangsta/cli"
 | 
				
			||||||
	"github.com/gogits/gogs/modules/log"
 | 
						"github.com/gogits/gogs/modules/log"
 | 
				
			||||||
@@ -205,6 +206,8 @@ func runServ(k *cli.Context) {
 | 
				
			|||||||
		return
 | 
							return
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						time.Sleep(time.Second)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// find push reference name
 | 
						// find push reference name
 | 
				
			||||||
	var t = "ok refs/heads/"
 | 
						var t = "ok refs/heads/"
 | 
				
			||||||
	var i int
 | 
						var i int
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user