Skip to content

[stable20] Make user list pagination more tolerant - #25475

Merged
PVince81 merged 1 commit into
stable20from
backport/25443/stable20
Feb 5, 2021
Merged

[stable20] Make user list pagination more tolerant#25475
PVince81 merged 1 commit into
stable20from
backport/25443/stable20

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Feb 4, 2021

Copy link
Copy Markdown

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #25443

@PVince81

PVince81 commented Feb 4, 2021

Copy link
Copy Markdown
Member

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
Copy Markdown
Member

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

@PVince81

Copy link
Copy Markdown
Member

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

@PVince81

Copy link
Copy Markdown
Member

failing acceptance sharing test unrelated to settings

@PVince81

Copy link
Copy Markdown
Member

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

@rullzerrullzer mentioned this pull request Feb 5, 2021
@rullzerrullzer 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
PVince81force-pushed the backport/25443/stable20 branch from a9716dd to ccaa593CompareFebruary 5, 2021 10:08
@PVince81

Copy link
Copy Markdown
Member

rebased to get CI green

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

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@PVince81@rullzer@ChristophWurst