diff options
| author | Unknwon <u@gogs.io> | 2015-11-03 13:00:04 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-11-03 13:00:04 -0500 |
| commit | 8411b50f5d4e3b30d7d601612ee2aa5e4921c968 (patch) | |
| tree | 5974fddf6fc71a3e45e801fdf2994a3ef3d5c445 | |
| parent | 8a87bee4346968e280e9b9a6e56373c1d2e1c357 (diff) | |
| download | gitea-8411b50f5d4e3b30d7d601612ee2aa5e4921c968.tar.gz gitea-8411b50f5d4e3b30d7d601612ee2aa5e4921c968.zip | |
work on #1882
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | models/repo.go | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 371ce51b10..837d9a1ccc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ go: - 1.3 - 1.4 - 1.5 - - tip before_install: - sudo apt-get update -qq @@ -12,7 +11,7 @@ before_install: - go get github.com/msteinert/pam install: - - go get -t ./... + - go get -t -v ./... script: go build -v -tags "pam" diff --git a/models/repo.go b/models/repo.go index 5f19159f57..32841efc1a 100644 --- a/models/repo.go +++ b/models/repo.go @@ -910,9 +910,9 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { } // Remove redundant collaborators. - collaborators, err := repo.GetCollaborators() + collaborators, err := repo.getCollaborators(sess) if err != nil { - return fmt.Errorf("GetCollaborators: %v", err) + return fmt.Errorf("getCollaborators: %v", err) } // Dummy object. @@ -948,9 +948,9 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error { } if newOwner.IsOrganization() { - t, err := newOwner.GetOwnerTeam() + t, err := newOwner.getOwnerTeam(sess) if err != nil { - return fmt.Errorf("GetOwnerTeam: %v", err) + return fmt.Errorf("getOwnerTeam: %v", err) } else if err = t.addRepository(sess, repo); err != nil { return fmt.Errorf("add to owner team: %v", err) } |