Browse Source

work on #1882

tags/v1.21.12.1
Unknwon 10 years ago
parent
commit
8411b50f5d
2 changed files with 5 additions and 6 deletions
  1. +1
    -2
      .travis.yml
  2. +4
    -4
      models/repo.go

+ 1
- 2
.travis.yml View File

@@ -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"



+ 4
- 4
models/repo.go View File

@@ -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)
}


Loading…
Cancel
Save