coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

work on #1882

This commit is contained in:
Unknwon 2015-11-03 13:00:04 -05:00
parent 8a87bee434
commit 8411b50f5d
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -4,7 +4,6 @@ go:
- 1.3 - 1.3
- 1.4 - 1.4
- 1.5 - 1.5
- tip
before_install: before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
@ -12,7 +11,7 @@ before_install:
- go get github.com/msteinert/pam - go get github.com/msteinert/pam
install: install:
- go get -t ./... - go get -t -v ./...
script: go build -v -tags "pam" script: go build -v -tags "pam"

8
models/repo.go
View File

@ -910,9 +910,9 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error {
} }
// Remove redundant collaborators. // Remove redundant collaborators.
collaborators, err := repo.GetCollaborators() collaborators, err := repo.getCollaborators(sess)
if err != nil { if err != nil {
return fmt.Errorf("GetCollaborators: %v", err) return fmt.Errorf("getCollaborators: %v", err)
} }
// Dummy object. // Dummy object.
@ -948,9 +948,9 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error {
} }
if newOwner.IsOrganization() { if newOwner.IsOrganization() {
t, err := newOwner.GetOwnerTeam() t, err := newOwner.getOwnerTeam(sess)
if err != nil { if err != nil {
return fmt.Errorf("GetOwnerTeam: %v", err) return fmt.Errorf("getOwnerTeam: %v", err)
} else if err = t.addRepository(sess, repo); err != nil { } else if err = t.addRepository(sess, repo); err != nil {
return fmt.Errorf("add to owner team: %v", err) return fmt.Errorf("add to owner team: %v", err)
} }