work on #1882

diff --git a/.travis.yml b/.travis.yml
index 371ce51b1029d3d4e63b08d85ab2cbdc584faf18..837d9a1ccc82742bc41a05f3862ea0cf8498227f 100644 (file)
--- 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 5f19159f5783931214eb07098703246ff38c4daf..32841efc1aa7d1d8f3a7daa857a3be69b9752491 100644 (file)
--- 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)
                }