From: FuXiaoHei <fuxiaohei@hexiaz.com>
Date: Thu, 13 Mar 2014 05:16:58 +0000 (+0800)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: v0.9.99~2458
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3005a0f13e8861c79e3ea84ce480124fbc3c181d;p=gitea.git

Merge remote-tracking branch 'origin/master'

Conflicts:
	routers/repo/single.go
	templates/repo/single.tmpl
---

3005a0f13e8861c79e3ea84ce480124fbc3c181d
diff --cc web.go
index 62395cf0bd,f108b1cf72..8e5bbaef0f
--- a/web.go
+++ b/web.go
@@@ -74,10 -74,10 +74,12 @@@ func runWeb(*cli.Context) 
  	m.Any("/repo/create", auth.SignInRequire(true), binding.BindIgnErr(auth.CreateRepoForm{}), repo.Create)
  	m.Any("/repo/delete", auth.SignInRequire(true), repo.Delete)
  	m.Any("/repo/list", auth.SignInRequire(false), repo.List)
 -	m.Get("/:username/:reponame", auth.SignInRequire(false), repo.Single)
 +	m.Get("/:username/:reponame", auth.SignInRequire(false), auth.RepoAssignment(true), repo.Single)
 +
 +	//m.Get("/:username/:reponame", repo.Repo)
  
+ 	//m.Get("/:username/:reponame", repo.Repo)
+ 
  	listenAddr := fmt.Sprintf("%s:%s",
  		base.Cfg.MustValue("server", "HTTP_ADDR"),
  		base.Cfg.MustValue("server", "HTTP_PORT", "3000"))