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

[4.0.x] fix: rework the previous fix for AM-757 as it doesn't work for some f… #3131

Merged
merged 1 commit into from
Oct 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 19, 2023

This is an automatic copy of pull request #3128 done by Mergify.


…actor

fixes AM-757

fixes gravitee-io/issues#9161


Cherry-pick of 7d6ed30 has failed:

On branch mergify/bp/4.0.x/pr-3128
Your branch is up to date with 'origin/4.0.x'.

You are currently cherry-picking commit 7d6ed30cec.
  (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:   gravitee-am-policy/gravitee-am-policy-enroll-mfa/src/test/java/io/gravitee/am/policy/enroll/mfa/EnrollMfaPolicyTest.java

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-am-policy/gravitee-am-policy-enroll-mfa/src/main/java/io/gravitee/am/policy/enroll/mfa/EnrollMfaPolicy.java

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 mergify bot requested a review from a team as a code owner October 19, 2023 07:50
@mergify mergify bot added the conflicts label Oct 19, 2023
@sonarcloud
Copy link

sonarcloud bot commented Oct 19, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

100.0% 100.0% Coverage
0.0% 0.0% Duplication

warning The version of Java (11.0.17) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

@leleueri leleueri merged commit f43fb46 into 4.0.x Oct 19, 2023
26 checks passed
@leleueri leleueri deleted the mergify/bp/4.0.x/pr-3128 branch October 19, 2023 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant