diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index f27de2eec2..fe6836a7bd 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 }} 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));