1 files changed, 19 insertions, 10 deletions
diff --git a/routers/api/v1/repo/commits.go b/routers/api/v1/repo/commits.go
index d8777eaf3a..f7da1698dc 100644
--- a/routers/api/v1/repo/commits.go
+++ b/routers/api/v1/repo/commits.go
@@ -16,6 +16,7 @@ import (
 	"code.gitea.io/gitea/modules/git"
 	"code.gitea.io/gitea/modules/setting"
 	api "code.gitea.io/gitea/modules/structs"
+	"code.gitea.io/gitea/routers/api/v1/utils"
 )
 
 // GetSingleCommit get a commit via
@@ -92,7 +93,11 @@ func GetAllCommits(ctx *context.APIContext) {
 	//   type: string
 	// - name: page
 	//   in: query
-	//   description: page number of requested commits
+	//   description: page number of results to return (1-based)
+	//   type: integer
+	// - name: limit
+	//   in: query
+	//   description: page size of results, maximum page size is 50
 	//   type: integer
 	// responses:
 	//   "200":
@@ -117,9 +122,13 @@ func GetAllCommits(ctx *context.APIContext) {
 	}
 	defer gitRepo.Close()
 
-	page := ctx.QueryInt("page")
-	if page <= 0 {
-		page = 1
+	listOptions := utils.GetListOptions(ctx)
+	if listOptions.Page <= 0 {
+		listOptions.Page = 1
+	}
+
+	if listOptions.PageSize > git.CommitsRangeSize {
+		listOptions.PageSize = git.CommitsRangeSize
 	}
 
 	sha := ctx.Query("sha")
@@ -154,10 +163,10 @@ func GetAllCommits(ctx *context.APIContext) {
 		return
 	}
 
-	pageCount := int(math.Ceil(float64(commitsCountTotal) / float64(git.CommitsRangeSize)))
+	pageCount := int(math.Ceil(float64(commitsCountTotal) / float64(listOptions.PageSize)))
 
 	// Query commits
-	commits, err := baseCommit.CommitsByRange(page)
+	commits, err := baseCommit.CommitsByRange(listOptions.Page, listOptions.PageSize)
 	if err != nil {
 		ctx.ServerError("CommitsByRange", err)
 		return
@@ -181,13 +190,13 @@ func GetAllCommits(ctx *context.APIContext) {
 		i++
 	}
 
-	ctx.SetLinkHeader(int(commitsCountTotal), git.CommitsRangeSize)
+	ctx.SetLinkHeader(int(commitsCountTotal), listOptions.PageSize)
 
-	ctx.Header().Set("X-Page", strconv.Itoa(page))
-	ctx.Header().Set("X-PerPage", strconv.Itoa(git.CommitsRangeSize))
+	ctx.Header().Set("X-Page", strconv.Itoa(listOptions.Page))
+	ctx.Header().Set("X-PerPage", strconv.Itoa(listOptions.PageSize))
 	ctx.Header().Set("X-Total", strconv.FormatInt(commitsCountTotal, 10))
 	ctx.Header().Set("X-PageCount", strconv.Itoa(pageCount))
-	ctx.Header().Set("X-HasMore", strconv.FormatBool(page < pageCount))
+	ctx.Header().Set("X-HasMore", strconv.FormatBool(listOptions.Page < pageCount))
 
 	ctx.JSON(http.StatusOK, &apiCommits)
 }