diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-24 22:30:50 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-03-24 22:30:50 +0800 |
| commit | 0e28dcdac402b3bfc8336fe250e3418939467208 (patch) | |
| tree | f16788377cf724e7d6ea28301f2876632a34d3dc /modules/middleware | |
| parent | 48ea9b12f65e21c8584eb89224bda4ad6c635847 (diff) | |
| parent | c9e1eb0a0d9e6bdafa158442158c762b7f188177 (diff) | |
Merge branch 'master' of github.com:gogits/gogs
Diffstat (limited to 'modules/middleware')
| -rw-r--r-- | modules/middleware/auth.go | 2 | ||||
| -rw-r--r-- | modules/middleware/repo.go | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go index 82c3367c..64f75d75 100644 --- a/modules/middleware/auth.go +++ b/modules/middleware/auth.go @@ -21,7 +21,7 @@ type ToggleOptions struct { func Toggle(options *ToggleOptions) martini.Handler { return func(ctx *Context) { - if options.SignOutRequire && ctx.IsSigned { + if options.SignOutRequire && ctx.IsSigned && ctx.Req.RequestURI != "/" { ctx.Redirect("/") return } diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index 3864caaf..eea2570c 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -69,8 +69,12 @@ func RepoAssignment(redirect bool) martini.Handler { ctx.Repo.IsWatching = models.IsWatching(ctx.User.Id, repo.Id) } ctx.Repo.Repository = repo + scheme := "http" + if base.EnableHttpsClone { + scheme = "https" + } ctx.Repo.CloneLink.SSH = fmt.Sprintf("git@%s:%s/%s.git", base.Domain, user.LowerName, repo.LowerName) - ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("https://%s/%s/%s.git", base.Domain, user.LowerName, repo.LowerName) + ctx.Repo.CloneLink.HTTPS = fmt.Sprintf("%s://%s/%s/%s.git", scheme, base.Domain, user.LowerName, repo.LowerName) ctx.Data["IsRepositoryValid"] = true ctx.Data["Repository"] = repo |