diff options
| author | Unknwon <u@gogs.io> | 2015-03-20 01:58:28 -0400 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-03-20 01:58:28 -0400 |
| commit | 62e436e6b7a41bac2e17a26f08649c144cef5b57 (patch) | |
| tree | 379be1b74989d5be2aacc68753b0d3d12597d400 /modules/middleware | |
| parent | 4b9fb43a708d0aaaf710a060f7b2dd0b7ad959d0 (diff) | |
| parent | e312634286e68d8fac4d20adb729661f8a444b2a (diff) | |
Merge branch 'develop' of github.com:gogits/gogs into release/0.6.1
Diffstat (limited to 'modules/middleware')
| -rw-r--r-- | modules/middleware/auth.go | 2 | ||||
| -rw-r--r-- | modules/middleware/repo.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go index 3c06c69f..b2aaae10 100644 --- a/modules/middleware/auth.go +++ b/modules/middleware/auth.go @@ -30,7 +30,7 @@ func Toggle(options *ToggleOptions) macaron.Handler { // Checking non-logged users landing page. if !ctx.IsSigned && ctx.Req.RequestURI == "/" && setting.LandingPageUrl != setting.LANDING_PAGE_HOME { - ctx.Redirect(string(setting.LandingPageUrl)) + ctx.Redirect(setting.AppSubUrl + string(setting.LandingPageUrl)) return } diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go index 3350c03d..a200d6d6 100644 --- a/modules/middleware/repo.go +++ b/modules/middleware/repo.go @@ -47,7 +47,7 @@ func ApiRepoAssignment() macaron.Handler { // Get repository. repo, err := models.GetRepositoryByName(u.Id, repoName) if err != nil { - if err == models.ErrRepoNotExist { + if models.IsErrRepoNotExist(err) { ctx.Error(404) } else { ctx.JSON(500, &base.ApiJsonErr{"GetRepositoryByName: " + err.Error(), base.DOC_URL}) @@ -223,7 +223,7 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler { // Get repository. repo, err := models.GetRepositoryByName(u.Id, repoName) if err != nil { - if err == models.ErrRepoNotExist { + if models.IsErrRepoNotExist(err) { ctx.Handle(404, "GetRepositoryByName", err) } else { ctx.Handle(500, "GetRepositoryByName", err) |