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 /models | |
| 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 'models')
| -rw-r--r-- | models/helper_environment.go | 8 | ||||
| -rw-r--r-- | models/wiki.go | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/models/helper_environment.go b/models/helper_environment.go index 0460fc3df5..2095205db3 100644 --- a/models/helper_environment.go +++ b/models/helper_environment.go @@ -12,13 +12,13 @@ import ( // PushingEnvironment returns an os environment to allow hooks to work on push func PushingEnvironment(doer *User, repo *Repository) []string { - return FullPushingEnvironment(doer, doer, repo, 0) + return FullPushingEnvironment(doer, doer, repo, repo.Name, 0) } // FullPushingEnvironment returns an os environment to allow hooks to work on push -func FullPushingEnvironment(author, committer *User, repo *Repository, prID int64) []string { +func FullPushingEnvironment(author, committer *User, repo *Repository, repoName string, prID int64) []string { isWiki := "false" - if strings.HasSuffix(repo.Name, ".wiki") { + if strings.HasSuffix(repoName, ".wiki") { isWiki = "true" } @@ -32,7 +32,7 @@ func FullPushingEnvironment(author, committer *User, repo *Repository, prID int6 "GIT_AUTHOR_EMAIL="+authorSig.Email, "GIT_COMMITTER_NAME="+committerSig.Name, "GIT_COMMITTER_EMAIL="+committerSig.Email, - EnvRepoName+"="+repo.Name, + EnvRepoName+"="+repoName, EnvRepoUsername+"="+repo.MustOwnerName(), EnvRepoIsWiki+"="+isWiki, EnvPusherName+"="+committer.Name, diff --git a/models/wiki.go b/models/wiki.go index 9ae3386333..d47f58f5a3 100644 --- a/models/wiki.go +++ b/models/wiki.go @@ -217,7 +217,13 @@ func (repo *Repository) updateWikiPage(doer *User, oldWikiName, newWikiName, con if err := git.Push(basePath, git.PushOptions{ Remote: "origin", Branch: fmt.Sprintf("%s:%s%s", commitHash.String(), git.BranchPrefix, "master"), - Env: PushingEnvironment(doer, repo), + Env: FullPushingEnvironment( + doer, + doer, + repo, + repo.Name+".wiki", + 0, + ), }); err != nil { log.Error("%v", err) return fmt.Errorf("Push: %v", err) |