Merge branch 'main' into wow-maths

go-gitea · Jun 24, 2022 · c78f1f1 · c78f1f1
2 parents d498472 + d0507ef
commit c78f1f1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/routers/web/user/home.go b/routers/web/user/home.go
@@ -141,6 +141,7 @@ func Dashboard(ctx *context.Context) {
 		OnlyPerformedBy: false,
 		IncludeDeleted:  false,
 		Date:            ctx.FormString("date"),
+		ListOptions:     db.ListOptions{PageSize: setting.UI.FeedPagingNum},
 	})
 	if err != nil {
 		ctx.ServerError("GetFeeds", err)

diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go
@@ -188,6 +188,7 @@ func Profile(ctx *context.Context) {
 			OnlyPerformedBy: true,
 			IncludeDeleted:  false,
 			Date:            ctx.FormString("date"),
+			ListOptions:     db.ListOptions{PageSize: setting.UI.FeedPagingNum},
 		})
 		if err != nil {
 			ctx.ServerError("GetFeeds", err)

diff --git a/routers/web/web.go b/routers/web/web.go
@@ -721,7 +721,7 @@ func RegisterRoutes(m *web.Route) {
 						}, reqPackageAccess(perm.AccessModeWrite))
 					})
 				})
-			}, context.PackageAssignment(), reqPackageAccess(perm.AccessModeRead))
+			}, ignSignIn, context.PackageAssignment(), reqPackageAccess(perm.AccessModeRead))
 		}
 	}, context_service.UserAssignmentWeb())