From 254370c5beca5062fc0307e4d1d4af09aea32bc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Bli=C5=BAniuk?= Date: Fri, 5 Dec 2025 00:11:04 +0100 Subject: [PATCH 1/2] ci: drop ARM v7 from docker builds (#13808) Removed optional ARM v7 (32 bit) platform from the workflow due to lack of support from Node and very limited usefulness. As the platform had been flaky in the past, this part of the workflow was already optional and didn't cause it to fail. So this is just the next step here. --- .github/workflows/docker.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e74e58c07b..d72d49e5c2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -26,9 +26,6 @@ jobs: - os: ubuntu-24.04-arm platforms: linux/arm64 required: true - - os: ubuntu-24.04-arm - platforms: linux/arm/v7 - required: false continue-on-error: ${{ !matrix.required }} runs-on: ${{ matrix.os }} steps: @@ -131,4 +128,4 @@ jobs: $(printf '${{ env.IMAGE }}@sha256:%s ' *) - name: Inspect image run: | - docker buildx imagetools inspect ${{ env.IMAGE }}:${{ steps.meta.outputs.version }} \ No newline at end of file + docker buildx imagetools inspect ${{ env.IMAGE }}:${{ steps.meta.outputs.version }} From ebf2a2c5afa31e69eb94901f8801620fe5f6fcd4 Mon Sep 17 00:00:00 2001 From: Nephilim Date: Fri, 5 Dec 2025 11:26:53 -0600 Subject: [PATCH 2/2] fix: respect user pagination settings in infinite scroll (#13765) (#13788) - Changed hardcoded topicsPerPage value of 20 to use settings.topicsPerPage - Allows infinite scroll to respect user's configured page size preference - Consistent with pagination handling in other controllers (category.js, recent.js, etc) - Validates against admin's maxTopicsPerPage setting - Fixes issue where all users were limited to 20 topics per request regardless of settings --- src/api/categories.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/categories.js b/src/api/categories.js index 476a0d4d9d..4806868f93 100644 --- a/src/api/categories.js +++ b/src/api/categories.js @@ -126,7 +126,7 @@ categoriesAPI.getTopics = async (caller, data) => { throw new Error('[[error:no-privileges]]'); } - const infScrollTopicsPerPage = 20; + const infScrollTopicsPerPage = settings.topicsPerPage; const sort = data.sort || data.categoryTopicSort || meta.config.categoryTopicSort || 'recently_replied'; let start = Math.max(0, parseInt(data.after || 0, 10));