|
@ -17,6 +17,7 @@ import ( |
|
|
"code.gitea.io/gitea/modules/auth" |
|
|
"code.gitea.io/gitea/modules/auth" |
|
|
"code.gitea.io/gitea/modules/context" |
|
|
"code.gitea.io/gitea/modules/context" |
|
|
"code.gitea.io/gitea/modules/convert" |
|
|
"code.gitea.io/gitea/modules/convert" |
|
|
|
|
|
"code.gitea.io/gitea/modules/git" |
|
|
"code.gitea.io/gitea/modules/log" |
|
|
"code.gitea.io/gitea/modules/log" |
|
|
"code.gitea.io/gitea/modules/migrations" |
|
|
"code.gitea.io/gitea/modules/migrations" |
|
|
"code.gitea.io/gitea/modules/notification" |
|
|
"code.gitea.io/gitea/modules/notification" |
|
@ -687,6 +688,17 @@ func updateBasicProperties(ctx *context.APIContext, opts api.EditRepoOption) err |
|
|
repo.IsTemplate = *opts.Template |
|
|
repo.IsTemplate = *opts.Template |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// Default branch only updated if changed and exist
|
|
|
|
|
|
if opts.DefaultBranch != nil && repo.DefaultBranch != *opts.DefaultBranch && ctx.Repo.GitRepo.IsBranchExist(*opts.DefaultBranch) { |
|
|
|
|
|
if err := ctx.Repo.GitRepo.SetDefaultBranch(*opts.DefaultBranch); err != nil { |
|
|
|
|
|
if !git.IsErrUnsupportedVersion(err) { |
|
|
|
|
|
ctx.Error(http.StatusInternalServerError, "SetDefaultBranch", err) |
|
|
|
|
|
return err |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
repo.DefaultBranch = *opts.DefaultBranch |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if err := models.UpdateRepository(repo, visibilityChanged); err != nil { |
|
|
if err := models.UpdateRepository(repo, visibilityChanged); err != nil { |
|
|
ctx.Error(http.StatusInternalServerError, "UpdateRepository", err) |
|
|
ctx.Error(http.StatusInternalServerError, "UpdateRepository", err) |
|
|
return err |
|
|
return err |
|
|