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

FEATURE: Workspace UI - Add second confirmation window for rebasing #5454

Open
wants to merge 9 commits into
base: 9.0
Choose a base branch
from

Conversation

pKallert
Copy link
Contributor

@pKallert pKallert commented Jan 29, 2025

As discussed in #5450 the "force rebase" journey is a little bit too harmless for dropping changes.

We discussed restricting the force rebase to editors but that was also not ideal since perhaps editors should not have to have admin permissions.

Changes in this PR:

  1. The popup looks more dangerous
  2. The conflicting changes are shown (just basic parsing, no details)
  3. A confirmation popup is shown

Bildschirmfoto 2025-01-29 um 10 45 59

Bildschirmfoto 2025-01-29 um 10 46 14

Bildschirmfoto 2025-01-29 um 11 20 08

Checklist

  • Code follows the PSR-2 coding style
  • Tests have been created, run and adjusted as needed
  • The PR is created against the lowest maintained branch
  • Reviewer - PR Title is brief but complete and starts with FEATURE|TASK|BUGFIX
  • Reviewer - The first section explains the change briefly for change-logs
  • Reviewer - Breaking Changes are marked with !!! and have upgrade-instructions

@github-actions github-actions bot added the 9.0 label Jan 29, 2025
@pKallert pKallert changed the title Draft: FEATURE: Workspace UI - Add second confirmation window for rebasing FEATURE: Workspace UI - Add second confirmation window for rebasing Jan 29, 2025
@pKallert pKallert requested review from mhsdesign and Sebobo January 29, 2025 11:02
@mhsdesign
Copy link
Member

Thank you so much that was faaaaaast :D

And i think i found a solution for the (too technical) json blob:

image

you only see it when you fold it:

image

ill push my patch as well ok?

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.

2 participants