diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-07-26 05:50:20 +0800 |
|---|---|---|
| committer | zeripath <art27@cantab.net> | 2019-07-25 22:50:20 +0100 |
| commit | 6782a704ef25f66902f357712218af9d4696fdda (patch) | |
| tree | 7a60488035da956390e27c2912f61198e6a8c1c4 /modules | |
| parent | 18c0e9c2a95f3051bc1615a6cda0dd88b5489117 (diff) | |
| download | gitea-6782a704ef25f66902f357712218af9d4696fdda.tar.gz gitea-6782a704ef25f66902f357712218af9d4696fdda.zip | |
Fix bug create/edit wiki pages when code master branch protected (#7580)
* fix bug create/edit wiki pages when code master branch protected
* improve FullPushingEnvironment function
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/pull/merge.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/pull/merge.go b/modules/pull/merge.go index 3e5721ad72..ed2fe48379 100644 --- a/modules/pull/merge.go +++ b/modules/pull/merge.go @@ -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 { |