Merge remote-tracking branch 'giteaoffical/main'

* giteaoffical/main: Document 409 error returned by repos/migrate api (go-gitea#19376) Fix middleware function's placements for some `/user/...` (go-gitea#19377) Fix panic in teams API when requesting members (go-gitea#19360)
zjjhot · Apr 12, 2022 · b0967c4 · b0967c4
2 parents 6764005 + f029b9a
commit b0967c4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go
@@ -387,7 +387,7 @@ func GetTeamMembers(ctx *context.APIContext) {
 		return
 	}
 
-	members := make([]*api.User, len(ctx.Org.Team.Members))
+	members := make([]*api.User, len(teamMembers))
 	for i, member := range teamMembers {
 		members[i] = convert.ToUser(member, ctx.Doer)
 	}

diff --git a/routers/api/v1/repo/migrate.go b/routers/api/v1/repo/migrate.go
@@ -52,6 +52,8 @@ func Migrate(ctx *context.APIContext) {
 	//     "$ref": "#/responses/Repository"
 	//   "403":
 	//     "$ref": "#/responses/forbidden"
+	//   "409":
+	//     description: The repository with the same name already exists.
 	//   "422":
 	//     "$ref": "#/responses/validationError"
 

diff --git a/routers/web/web.go b/routers/web/web.go
@@ -429,18 +429,18 @@ func RegisterRoutes(m *web.Route) {
 
 	m.Group("/user", func() {
 		// r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
-		m.Get("/activate", auth.Activate, reqSignIn)
-		m.Post("/activate", auth.ActivatePost, reqSignIn)
+		m.Get("/activate", auth.Activate)
+		m.Post("/activate", auth.ActivatePost)
 		m.Any("/activate_email", auth.ActivateEmail)
 		m.Get("/avatar/{username}/{size}", user.AvatarByUserName)
 		m.Get("/recover_account", auth.ResetPasswd)
 		m.Post("/recover_account", auth.ResetPasswdPost)
 		m.Get("/forgot_password", auth.ForgotPasswd)
 		m.Post("/forgot_password", auth.ForgotPasswdPost)
 		m.Post("/logout", auth.SignOut)
-		m.Get("/task/{task}", user.TaskStatus)
-		m.Get("/stopwatches", user.GetStopwatches, reqSignIn)
-		m.Get("/search", user.Search, ignExploreSignIn)
+		m.Get("/task/{task}", reqSignIn, user.TaskStatus)
+		m.Get("/stopwatches", reqSignIn, user.GetStopwatches)
+		m.Get("/search", ignExploreSignIn, user.Search)
 	})
 	// ***** END: User *****
 

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
@@ -2222,6 +2222,9 @@
           "403": {
             "$ref": "#/responses/forbidden"
           },
+          "409": {
+            "description": "The repository with the same name already exists."
+          },
           "422": {
             "$ref": "#/responses/validationError"
           }