mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-27 00:23:41 +09:00 
			
		
		
		
	Don't assume the default wiki branch is master in the wiki API (#34244)
Resolves #34218. In the recent past, the default wiki branch was made to be changeable. This change reflects this.
This commit is contained in:
		| @@ -193,7 +193,7 @@ func getWikiPage(ctx *context.APIContext, wikiName wiki_service.WebPath) *api.Wi | ||||
| 	} | ||||
|  | ||||
| 	// get commit count - wiki revisions | ||||
| 	commitsCount, _ := wikiRepo.FileCommitsCount("master", pageFilename) | ||||
| 	commitsCount, _ := wikiRepo.FileCommitsCount(ctx.Repo.Repository.DefaultWikiBranch, pageFilename) | ||||
|  | ||||
| 	// Get last change information. | ||||
| 	lastCommit, err := wikiRepo.GetCommitByPath(pageFilename) | ||||
| @@ -432,7 +432,7 @@ func ListPageRevisions(ctx *context.APIContext) { | ||||
| 	} | ||||
|  | ||||
| 	// get commit count - wiki revisions | ||||
| 	commitsCount, _ := wikiRepo.FileCommitsCount("master", pageFilename) | ||||
| 	commitsCount, _ := wikiRepo.FileCommitsCount(ctx.Repo.Repository.DefaultWikiBranch, pageFilename) | ||||
|  | ||||
| 	page := ctx.FormInt("page") | ||||
| 	if page <= 1 { | ||||
| @@ -442,7 +442,7 @@ func ListPageRevisions(ctx *context.APIContext) { | ||||
| 	// get Commit Count | ||||
| 	commitsHistory, err := wikiRepo.CommitsByFileAndRange( | ||||
| 		git.CommitsByFileAndRangeOptions{ | ||||
| 			Revision: "master", | ||||
| 			Revision: ctx.Repo.Repository.DefaultWikiBranch, | ||||
| 			File:     pageFilename, | ||||
| 			Page:     page, | ||||
| 		}) | ||||
| @@ -486,7 +486,7 @@ func findWikiRepoCommit(ctx *context.APIContext) (*git.Repository, *git.Commit) | ||||
| 		return nil, nil | ||||
| 	} | ||||
|  | ||||
| 	commit, err := wikiRepo.GetBranchCommit("master") | ||||
| 	commit, err := wikiRepo.GetBranchCommit(ctx.Repo.Repository.DefaultWikiBranch) | ||||
| 	if err != nil { | ||||
| 		if git.IsErrNotExist(err) { | ||||
| 			ctx.APIErrorNotFound(err) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user