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

fix(credentials): set backend storage as default (backport #672) #674

Merged
merged 2 commits into from
Nov 18, 2022

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 18, 2022

This is an automatic backport of pull request #672 done by Mergify.
Cherry-pick of 7ba910e has failed:

On branch mergify/bp/cryostat-v2.2/pr-672
Your branch is up to date with 'origin/cryostat-v2.2'.

You are currently cherry-picking commit 7ba910e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/app/Settings/CredentialsStorage.tsx
	modified:   src/app/Shared/Services/JmxCredentials.service.tsx
	modified:   src/test/Settings/__snapshots__/CredentialsStorage.test.tsx.snap

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/test/Settings/CredentialsStorage.test.tsx

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 7ba910e)

# Conflicts:
#	src/test/Settings/CredentialsStorage.test.tsx
@mergify mergify bot added the conflicts label Nov 18, 2022
@mergify mergify bot assigned tthvo Nov 18, 2022
@github-actions
Copy link

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

1 similar comment
@github-actions
Copy link

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

@tthvo
Copy link
Member

tthvo commented Nov 18, 2022

Ahh I think we didnt have the commits that updates test setup here on cryostat-2.2 (i.e. Common.tsx is not updated to use custom render).

@andrewazores
Copy link
Member

Yea, makes sense. The broken patch here doesn't look too bad to clean up though, luckily.

@tthvo
Copy link
Member

tthvo commented Nov 18, 2022

Yea, makes sense. The broken patch here doesn't look too bad to clean up though, luckily

Should we grab the content of Common.tsx and include that changes here?

@andrewazores
Copy link
Member

I would prefer not to, if it can be avoided.

@tthvo
Copy link
Member

tthvo commented Nov 18, 2022

Right I fixed it with using the old setup then :D

@andrewazores andrewazores merged commit e5f2a05 into cryostat-v2.2 Nov 18, 2022
@mergify mergify bot deleted the mergify/bp/cryostat-v2.2/pr-672 branch November 18, 2022 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

2 participants