tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-11-04 05:18:25 +00:00
Code Releases Activity

Fix bug create/edit wiki pages when code master branch protected (#7580) (#7623)

Browse Source 
* fix bug create/edit wiki pages when code master branch protected

* improve FullPushingEnvironment function
This commit is contained in:
Lunny Xiao
2019-07-26 09:22:20 +08:00
committed by Lauris BH
parent b7e41f7b8f
commit 4c69e158e5
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/pull/merge.go
View File

@@ -240,7 +240,13 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
headUser = doer
}
env := models.FullPushingEnvironment(headUser, doer, pr.BaseRepo, pr.ID)
env := models.FullPushingEnvironment(
headUser,
doer,
pr.BaseRepo,
pr.BaseRepo.Name,
pr.ID,
)
// Push back to upstream.
if err := git.NewCommand("push", "origin", pr.BaseBranch).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, nil, &errbuf); err != nil {