"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "routers/repo/pull.go" between
gitea-1.13.1.tar.gz and gitea-1.13.2.tar.gz

About: Gitea allows to set up a self-hosted code hosting Git service (a fork of Gogs).

pull.go  (gitea-1.13.1):pull.go  (gitea-1.13.2)
skipping to change at line 699 skipping to change at line 699
if issue.IsClosed { if issue.IsClosed {
ctx.NotFound("MergePullRequest", nil) ctx.NotFound("MergePullRequest", nil)
return return
} }
if issue.PullRequest.HasMerged { if issue.PullRequest.HasMerged {
ctx.NotFound("MergePullRequest", nil) ctx.NotFound("MergePullRequest", nil)
return return
} }
if err := issue.PullRequest.LoadBaseRepo(); err != nil { if err := issue.PullRequest.LoadBaseRepo(); err != nil {
ctx.InternalServerError(err) ctx.ServerError("LoadBaseRepo", err)
return return
} }
if err := issue.PullRequest.LoadHeadRepo(); err != nil { if err := issue.PullRequest.LoadHeadRepo(); err != nil {
ctx.InternalServerError(err) ctx.ServerError("LoadHeadRepo", err)
return return
} }
allowedUpdate, err := pull_service.IsUserAllowedToUpdate(issue.PullReques t, ctx.User) allowedUpdate, err := pull_service.IsUserAllowedToUpdate(issue.PullReques t, ctx.User)
if err != nil { if err != nil {
ctx.ServerError("IsUserAllowedToMerge", err) ctx.ServerError("IsUserAllowedToMerge", err)
return return
} }
// ToDo: add check if maintainers are allowed to change branch ... (need migration & co) // ToDo: add check if maintainers are allowed to change branch ... (need migration & co)
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)