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

diff --cc routers/repo/single.go
Simple merge

diff --cc web.go
index 8d4fd5b5c93c9d00241956ddbc288c627a56d7f6,af430917f58413a43bf0b8408b99cdfe20c56b2f..3f0e0ef7e23bc5ae0a7098ab89a553b7a8266e7c
--- 1/web.go
--- 2/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)