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

[stable28] fix: cypress #2188

Merged
merged 4 commits into from
Mar 7, 2024
Merged

[stable28] fix: cypress #2188

merged 4 commits into from
Mar 7, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Mar 7, 2024

Backport of #2187

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

[skip ci]
@backportbot backportbot bot requested a review from skjnldsv March 7, 2024 13:26
@backportbot backportbot bot added the 3. to review Waiting for reviews label Mar 7, 2024
@backportbot backportbot bot added this to the Nextcloud 28.0.4 milestone Mar 7, 2024
@skjnldsv skjnldsv marked this pull request as ready for review March 7, 2024 13:28
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
@skjnldsv
Copy link
Member

skjnldsv commented Mar 7, 2024

/compile /

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@skjnldsv skjnldsv merged commit 7f81bf6 into stable28 Mar 7, 2024
30 of 32 checks passed
@skjnldsv skjnldsv deleted the backport/2187/stable28 branch March 7, 2024 21:14
@skjnldsv
Copy link
Member

/backport to stable27

@backportbot backportbot bot added the backport-request Pending backport by the backport-bot label Mar 10, 2024
Copy link
Author

backportbot bot commented Mar 10, 2024

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b backport/2188/stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 1533fd5c 396bf69b 914e2a10 542dc4b3

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/2188/stable27

Error: No changes found in backport branch


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@Altahrim Altahrim mentioned this pull request Mar 21, 2024
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews backport-request Pending backport by the backport-bot
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants