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.1.x] AM-688: Do not refer to company.com #3289

Merged
merged 2 commits into from
Dec 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 14, 2023

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


AM-688


Cherry-pick of 12c6efa has failed:

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

You are currently cherry-picking commit 12c6efa872.
  (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-gateway/gravitee-am-gateway-handler/gravitee-am-gateway-handler-core/src/test/java/io/gravitee/am/gateway/handler/vertx/auth/webauthn/WebAuthnFactoryTest.java
	modified:   gravitee-am-identityprovider/gravitee-am-identityprovider-http/src/main/resources/schemas/schema-form.json
	modified:   gravitee-am-management-api/gravitee-am-management-api-rest/src/main/java/io/gravitee/am/management/handlers/management/api/preview/PreviewBuilder.java
	modified:   gravitee-am-management-api/gravitee-am-management-api-rest/src/test/java/io/gravitee/am/management/handlers/management/api/resources/EntrypointResourceTest.java
	modified:   gravitee-am-management-api/gravitee-am-management-api-rest/src/test/java/io/gravitee/am/management/handlers/management/api/resources/EntrypointsResourceTest.java
	modified:   gravitee-am-management-api/gravitee-am-management-api-standalone/gravitee-am-management-api-standalone-distribution/src/main/resources/config/gravitee.yml
	modified:   gravitee-am-policy/gravitee-am-policy-send-email/src/main/java/io/gravitee/am/policy/send/email/configuration/SendEmailPolicyConfiguration.java
	modified:   gravitee-am-policy/gravitee-am-policy-send-email/src/main/resources/schemas/schema-form.json
	modified:   gravitee-am-service/src/main/java/io/gravitee/am/service/impl/EntrypointServiceImpl.java
	modified:   gravitee-am-service/src/test/java/io/gravitee/am/service/EntrypointServiceTest.java
	modified:   gravitee-am-test/specs/gateway/flow-execution.jest.spec.ts
	modified:   gravitee-am-ui/src/app/domain/applications/application/overview/overview.component.html
	modified:   gravitee-am-ui/src/app/domain/components/emails/email/email.component.html
	modified:   helm/README.adoc
	modified:   helm/README.md
	modified:   helm/values.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-am-gateway/gravitee-am-gateway-standalone/gravitee-am-gateway-standalone-distribution/src/main/resources/config/gravitee.yml
	both modified:   helm/tests/api-configmap_test.yaml

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

(cherry picked from commit 12c6efa)

# Conflicts:
#	gravitee-am-gateway/gravitee-am-gateway-standalone/gravitee-am-gateway-standalone-distribution/src/main/resources/config/gravitee.yml
#	helm/tests/api-configmap_test.yaml
@mergify mergify bot requested a review from a team as a code owner December 14, 2023 11:32
@mergify mergify bot added the conflicts label Dec 14, 2023
Copy link

@mstasgravitee mstasgravitee merged commit b48cc67 into 4.1.x Dec 14, 2023
2 checks passed
@mstasgravitee mstasgravitee deleted the mergify/bp/4.1.x/pr-3275 branch December 14, 2023 14:14
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.

2 participants