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

ui: disable invited tab when team is synced (PROJQUAY-6831) #2838

Merged
merged 2 commits into from Apr 26, 2024

Conversation

Sunandadadi
Copy link
Contributor

Screenshot 2024-04-24 at 3 20 53 PM

harishsurf
harishsurf previously approved these changes Apr 25, 2024
Copy link
Contributor

@harishsurf harishsurf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small nit, otherwise lgtm!

@Sunandadadi Sunandadadi merged commit f0bce43 into quay:master Apr 26, 2024
30 of 31 checks passed
@Sunandadadi Sunandadadi deleted the PROJQUAY-6831 branch April 26, 2024 13:17
@Sunandadadi
Copy link
Contributor Author

/cherrypick redhat-3.11

@openshift-cherrypick-robot

@Sunandadadi: #2838 failed to apply on top of branch "redhat-3.11":

Applying: ui: disable invited tab when team is synced (PROJQUAY-6831)
Using index info to reconstruct a base tree...
M	web/cypress/e2e/team-sync.cy.ts
M	web/src/routes/OrganizationsList/Organization/Tabs/TeamsAndMembership/TeamsView/ManageMembers/ManageMembersList.tsx
Falling back to patching base and 3-way merge...
Auto-merging web/src/routes/OrganizationsList/Organization/Tabs/TeamsAndMembership/TeamsView/ManageMembers/ManageMembersList.tsx
Auto-merging web/cypress/e2e/team-sync.cy.ts
CONFLICT (content): Merge conflict in web/cypress/e2e/team-sync.cy.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 ui: disable invited tab when team is synced (PROJQUAY-6831)
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".

In response to this:

/cherrypick redhat-3.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@Sunandadadi
Copy link
Contributor Author

/cherrypick redhat-3.11

@openshift-cherrypick-robot

@Sunandadadi: new pull request created: #2845

In response to this:

/cherrypick redhat-3.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants