Closed ahmadhamzh closed 1 month ago
Please add a release note.
/retest
/retest
/test pre-dashboard-web-integration-tests-ce
LGTM label has been added.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: ahmedwaleedmalik
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/cherry-pick release/v2.25
@ahmedwaleedmalik: once the present PR merges, I will cherry-pick it on top of release/v2.25 in a new PR and assign it to you.
/cherry-pick release/v2.24
@ahmedwaleedmalik: once the present PR merges, I will cherry-pick it on top of release/v2.24 in a new PR and assign it to you.
/cherry-pick release/v2.23
@ahmedwaleedmalik: once the present PR merges, I will cherry-pick it on top of release/v2.23 in a new PR and assign it to you.
@ahmedwaleedmalik: #6741 failed to apply on top of branch "release/v2.23":
Applying: fix the paginator in project members table
Using index info to reconstruct a base tree...
M modules/web/src/app/member/component.ts
Falling back to patching base and 3-way merge...
Auto-merging modules/web/src/app/member/component.ts
CONFLICT (content): Merge conflict in modules/web/src/app/member/component.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix the paginator in project members table
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
@ahmedwaleedmalik: #6741 failed to apply on top of branch "release/v2.25":
Applying: fix the paginator in project members table
Using index info to reconstruct a base tree...
M modules/web/src/app/member/component.ts
Falling back to patching base and 3-way merge...
Auto-merging modules/web/src/app/member/component.ts
CONFLICT (content): Merge conflict in modules/web/src/app/member/component.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix the paginator in project members table
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
@ahmedwaleedmalik: #6741 failed to apply on top of branch "release/v2.24":
Applying: fix the paginator in project members table
Using index info to reconstruct a base tree...
M modules/web/src/app/member/component.ts
Falling back to patching base and 3-way merge...
Auto-merging modules/web/src/app/member/component.ts
CONFLICT (content): Merge conflict in modules/web/src/app/member/component.ts
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix the paginator in project members table
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
What this PR does / why we need it: fix the pagination for the project member table
member page:
Which issue(s) this PR fixes:
Fixes #6737
What type of PR is this? /kind bug /kind cleanup