Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable20] Make user list pagination more tolerant #25475

Merged
merged 1 commit into from Feb 5, 2021

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Feb 4, 2021

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #25443

@PVince81
Copy link
Member

PVince81 commented Feb 4, 2021

I've rebuilt the assets with "make dev-setup && make build-js-production", squashed and retested.

I'm just a bit surprised that the asset builder decided to delete some files:

        modified:   apps/settings/js/vue-settings-apps-users-management.js
        modified:   apps/settings/js/vue-settings-apps-users-management.js.map
        deleted:    apps/settings/js/vue-settings-users-6af167634af13765ed18.js
        deleted:    apps/settings/js/vue-settings-users-6af167634af13765ed18.js.map
        deleted:    apps/settings/js/vue-settings-users-949e04a80c66e7d41667.js
        deleted:    apps/settings/js/vue-settings-users-949e04a80c66e7d41667.js.map
        deleted:    apps/settings/js/vue-vendors-settings-apps-settings-users-56bf9f00883bb2b317ca.js
        deleted:    apps/settings/js/vue-vendors-settings-apps-settings-users-56bf9f00883bb2b317ca.js.map
        deleted:    apps/settings/js/vue-vendors-settings-apps-settings-users-f077c891fa908a10fb34.js
        deleted:    apps/settings/js/vue-vendors-settings-apps-settings-users-f077c891fa908a10fb34.js.map
        deleted:    apps/settings/js/vue-vendors-settings-users-3a6581e78bc592eedd33.js
        deleted:    apps/settings/js/vue-vendors-settings-users-3a6581e78bc592eedd33.js.map
        deleted:    apps/settings/js/vue-vendors-settings-users-7d5a89099bb7bbf586db.js
        deleted:    apps/settings/js/vue-vendors-settings-users-7d5a89099bb7bbf586db.js.map

@PVince81
Copy link
Member

PVince81 commented Feb 4, 2021

the same happens on another PR where it would also delete exactly these files :-/

@PVince81
Copy link
Member

PVince81 commented Feb 4, 2021

I've pushed that strange removal as a separate PR #25480 for further discussion.

@PVince81
Copy link
Member

PVince81 commented Feb 5, 2021

failing acceptance sharing test unrelated to settings

@PVince81
Copy link
Member

PVince81 commented Feb 5, 2021

I've raised #25491 to look into the failed sharing acceptance test as it seems to happen consistently on stable20.

@rullzer rullzer mentioned this pull request Feb 5, 2021
@rullzer rullzer added the 3. to review Waiting for reviews label Feb 5, 2021
In case the server returns more results than expected by the limit, it
is now still interpreted as there being more results to query.

This situation can happen when there are multiple user backends in
place.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
@PVince81
Copy link
Member

PVince81 commented Feb 5, 2021

rebased to get CI green

@PVince81 PVince81 merged commit efe9ef2 into stable20 Feb 5, 2021
@PVince81 PVince81 deleted the backport/25443/stable20 branch February 5, 2021 13:46
@rullzer rullzer mentioned this pull request Feb 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants