diff options
Diffstat (limited to 'models/repo.go')
| -rw-r--r-- | models/repo.go | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/models/repo.go b/models/repo.go index cfab329b..5412ca8f 100644 --- a/models/repo.go +++ b/models/repo.go @@ -104,8 +104,8 @@ func NewRepoContext() { log.Fatal(4, "Gogs requires Git version greater or equal to 1.7.1") } - // Check if server has user.email and user.name set correctly and set if they're not. - for configKey, defaultValue := range map[string]string{"user.name": "Gogs", "user.email": "gogitservice@gmail.com"} { + // Git requires setting user.name and user.email in order to commit changes. + for configKey, defaultValue := range map[string]string{"user.name": "Gogs", "user.email": "gogs@fake.local"} { if stdout, stderr, err := process.Exec("NewRepoContext(get setting)", "git", "config", "--get", configKey); err != nil || strings.TrimSpace(stdout) == "" { // ExitError indicates this config is not set if _, ok := err.(*exec.ExitError); ok || strings.TrimSpace(stdout) == "" { @@ -1107,6 +1107,10 @@ func (repo *Repository) AddCollaborator(u *User) error { return nil } + if err = repo.GetOwner(); err != nil { + return fmt.Errorf("GetOwner: %v", err) + } + sess := x.NewSession() defer sessionRelease(sess) if err = sess.Begin(); err != nil { @@ -1115,8 +1119,15 @@ func (repo *Repository) AddCollaborator(u *User) error { if _, err = sess.InsertOne(collaboration); err != nil { return err - } else if err = repo.recalculateAccesses(sess); err != nil { - return err + } + + if repo.Owner.IsOrganization() { + err = repo.recalculateTeamAccesses(sess, 0) + } else { + err = repo.recalculateAccesses(sess) + } + if err != nil { + return fmt.Errorf("recalculateAccesses 'team=%v': %v", repo.Owner.IsOrganization(), err) } return sess.Commit() |