From: Unknown <joe2010xtmf@163.com>
Date: Sat, 15 Mar 2014 16:13:48 +0000 (-0400)
Subject: Merge branch 'master' of github.com:gogits/gogs
X-Git-Tag: v0.9.99~2428^2~2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f026ae86528bd77c6af5a72aa780e1b9d6064524;p=gitea.git

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

f026ae86528bd77c6af5a72aa780e1b9d6064524
diff --cc web.go
index 8d4fd5b5c9,af430917f5..3f0e0ef7e2
--- a/web.go
+++ b/web.go
@@@ -66,13 -66,14 +66,13 @@@ func runWeb(*cli.Context) 
  
  	m.Any("/repo/create", middleware.SignInRequire(true), binding.BindIgnErr(auth.CreateRepoForm{}), repo.Create)
  	m.Any("/repo/delete", middleware.SignInRequire(true), binding.Bind(auth.DeleteRepoForm{}), repo.Delete)
 -	m.Any("/repo/list", middleware.SignInRequire(false), repo.List)
  
- 	m.Get("/:username/:reponame/settings", middleware.SignInRequire(false), auth.RepoAssignment(true), repo.Setting)
+ 	m.Get("/:username/:reponame/settings", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Setting)
  	m.Get("/:username/:reponame/tree/:branchname/**",
- 		middleware.SignInRequire(false), auth.RepoAssignment(true), repo.Single)
+ 		middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Single)
  	m.Get("/:username/:reponame/tree/:branchname",
- 		middleware.SignInRequire(false), auth.RepoAssignment(true), repo.Single)
- 	m.Get("/:username/:reponame", middleware.SignInRequire(false), auth.RepoAssignment(true), repo.Single)
+ 		middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Single)
+ 	m.Get("/:username/:reponame", middleware.SignInRequire(false), middleware.RepoAssignment(true), repo.Single)
  
  	//m.Get("/:username/:reponame", repo.Repo)