summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--integrations/api_repo_test.go1
-rw-r--r--models/migrations/migrations.go1
-rw-r--r--routers/api/v1/admin/adopt.go4
3 files changed, 4 insertions, 2 deletions
diff --git a/integrations/api_repo_test.go b/integrations/api_repo_test.go
index 52764a3a69..ce1ecb1d43 100644
--- a/integrations/api_repo_test.go
+++ b/integrations/api_repo_test.go
@@ -468,7 +468,6 @@ func TestAPIRepoTransfer(t *testing.T) {
expectedStatus int
}{
// Disclaimer for test story: "user1" is an admin, "user2" is normal user and part of in owner team of org "user3"
-
// Transfer to a user with teams in another org should fail
{ctxUserID: 1, newOwner: "user3", teams: &[]int64{5}, expectedStatus: http.StatusForbidden},
// Transfer to a user with non-existent team IDs should fail
diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go
index 63d1c32259..31b172a68d 100644
--- a/models/migrations/migrations.go
+++ b/models/migrations/migrations.go
@@ -61,7 +61,6 @@ type Version struct {
// update minDBVersion accordingly
var migrations = []Migration{
// Gitea 1.5.0 ends at v69
-
// v70 -> v71
NewMigration("add issue_dependencies", addIssueDependencies),
// v71 -> v72
diff --git a/routers/api/v1/admin/adopt.go b/routers/api/v1/admin/adopt.go
index 1c0e237cdb..db1754c8d0 100644
--- a/routers/api/v1/admin/adopt.go
+++ b/routers/api/v1/admin/adopt.go
@@ -43,9 +43,13 @@ func ListUnadoptedRepositories(ctx *context.APIContext) {
// "$ref": "#/responses/forbidden"
listOptions := utils.GetListOptions(ctx)
+ if listOptions.Page == 0 {
+ listOptions.Page = 1
+ }
repoNames, count, err := repo_service.ListUnadoptedRepositories(ctx.FormString("query"), &listOptions)
if err != nil {
ctx.InternalServerError(err)
+ return
}
ctx.SetTotalCountHeader(int64(count))