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.

Sign up for GitHub

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

Jump to bottom

[Bug]: Unprotect branch option unprotects all branches #33310

Closed
nidhi-nair opened this issue May 9, 2024 — with Slack · 2 comments · Fixed by #34244
Closed

[Bug]: Unprotect branch option unprotects all branches #33310

nidhi-nair opened this issue May 9, 2024 — with Slack · 2 comments · Fixed by #34244
Assignees
@nidhi-nair @brayn003
Labels
Branch protection Issues related to using a protected branch on git Bug Something isn't working Git Pod Anything related to git sync Git Version Control Issues related to version control High This issue blocks a user from building or impacts a lot of users Production QA Pod Issues under the QA Pod QA Needs QA attention

Comments

@nidhi-nair Slack
Copy link
Contributor

nidhi-nair commented May 9, 2024 •
edited
Loading

If I add a second branch as a protected branch and unprotect it fro m the option at the top of the screen, all my branches end up getting unprotected.

Screen.Recording.2024-05-09.at.11.49.43.AM.mov
@nidhi-nair nidhi-nair added Branch protection Issues related to using a protected branch on git Bug Something isn't working Git Version Control Issues related to version control Production labels May 9, 2024 — with Slack
@Nikhil-Nandagopal Nikhil-Nandagopal added Critical This issue needs immediate attention. Drop everything else High This issue blocks a user from building or impacts a lot of users Medium Issues that frustrate users due to poor UX labels May 9, 2024
@github-actions github-actions bot added Git Pod Anything related to git sync labels May 9, 2024
@nidhi-nair nidhi-nair removed Medium Issues that frustrate users due to poor UX Critical This issue needs immediate attention. Drop everything else labels May 9, 2024
@AnkitaGupta111
Copy link

@nidhi-nair @Nikhil-Nandagopal I tried replicating this issue but couldn't replicate. This Feature of protecting multiple branches is removed from non enterprise appsmith edition it seems. I am able to protect only master branch.

Screencast.2024-06-06.17.37.16.mp4

@Nikhil-Nandagopal
Copy link
Contributor

@AnkitaGupta111 this is an enterprise specific issue so you will not be able to see it

@Nikhil-Nandagopal Nikhil-Nandagopal mentioned this issue Jun 11, 2024
Closed
1 task
@brayn003 brayn003 mentioned this issue Jun 14, 2024
Merged
2 tasks
brayn003 added a commit that referenced this issue Jun 14, 2024
@brayn003
fix: fixing unprotect logic in callout (#34244)
cae0114 
## Description
Clicking "Unprotect branch" in the branch protection callout was making
all the branches as unprotected. This PR fixes that and only allows the
current branch to be unprotected


Fixes #33310  #34005

## Automation

/ok-to-test tags="@tag.Git"

### 🔍 Cypress test results
<!-- This is an auto-generated comment: Cypress test results  -->
> [!TIP]
> 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉
> Workflow run:
<https://github.com/appsmithorg/appsmith/actions/runs/9511853863>
> Commit: 1ccab8a
> Cypress dashboard url: <a
href="https://internal.appsmith.com/app/cypress-dashboard/rundetails-65890b3c81d7400d08fa9ee5?branch=master&workflowId=9511853863&attempt=1"
target="_blank">Click here!</a>

<!-- end of auto-generated comment: Cypress test results  -->




## Communication
Should the DevRel and Marketing teams inform users about this change?
- [ ] Yes
- [ ] No


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **New Features**
- Enhanced IDE with advanced branch protection management, including the
ability to unprotect branches directly within the IDE.

- **Bug Fixes**
- Improved handling of current branch filtering to ensure accurate
protected branch management.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
@appsmith-bot appsmith-bot added the QA Needs QA attention label Jun 14, 2024
@github-actions github-actions bot added the QA Pod Issues under the QA Pod label Jun 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@nidhi-nair nidhi-nair

@brayn003 brayn003

Labels
Branch protection Issues related to using a protected branch on git Bug Something isn't working Git Pod Anything related to git sync Git Version Control Issues related to version control High This issue blocks a user from building or impacts a lot of users Production QA Pod Issues under the QA Pod QA Needs QA attention
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

fix: fixing unprotect logic in callout appsmithorg/appsmith
5 participants
@Nikhil-Nandagopal @nidhi-nair @brayn003 @AnkitaGupta111 @appsmith-bot