diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/git/repo_tag.go | 2 | ||||
| -rw-r--r-- | modules/git/utils.go | 8 | ||||
| -rw-r--r-- | modules/middleware/org.go | 6 |
3 files changed, 15 insertions, 1 deletions
diff --git a/modules/git/repo_tag.go b/modules/git/repo_tag.go index ed994d48..45a1df70 100644 --- a/modules/git/repo_tag.go +++ b/modules/git/repo_tag.go @@ -27,7 +27,7 @@ func (repo *Repository) GetTags() ([]string, error) { } stdout, stderr, err := com.ExecCmdDir(repo.Path, "git", "tag", "-l") if err != nil { - return nil, errors.New(stderr) + return nil, concatenateError(err, stderr) } tags := strings.Split(stdout, "\n") return tags[:len(tags)-1], nil diff --git a/modules/git/utils.go b/modules/git/utils.go index 6abbca55..78792aaf 100644 --- a/modules/git/utils.go +++ b/modules/git/utils.go @@ -7,6 +7,7 @@ package git import ( "bytes" "container/list" + "fmt" "os" "path/filepath" "strings" @@ -67,3 +68,10 @@ func isFile(filePath string) bool { } return !f.IsDir() } + +func concatenateError(err error, stderr string) error { + if len(stderr) == 0 { + return err + } + return fmt.Errorf("%v: %s", err, stderr) +} diff --git a/modules/middleware/org.go b/modules/middleware/org.go index 0e544fe4..1ac4bcf1 100644 --- a/modules/middleware/org.go +++ b/modules/middleware/org.go @@ -47,6 +47,12 @@ func OrgAssignment(redirect bool, args ...bool) macaron.Handler { org := ctx.Org.Organization ctx.Data["Org"] = org + // Force redirection when username is actually a user. + if !org.IsOrganization() { + ctx.Redirect("/" + org.Name) + return + } + if ctx.IsSigned { ctx.Org.IsOwner = org.IsOwnedBy(ctx.User.Id) if ctx.Org.IsOwner { |