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

[master] allow users to handle properly baseUrl in portal next for multi tenant installations #10458

Merged
merged 1 commit into from
Jan 17, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 17, 2025

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


Issue

https://gravitee.atlassian.net/browse/APIM-7714

Description

allow users to handle properly baseUrl in portal next for multi tenant installations

Additional context


Cherry-pick of 542f89a has failed:

On branch mergify/bp/master/pr-10444
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 542f89a359.
  (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:   helm/templates/portal/portal-configmap.yaml
	modified:   helm/templates/portal/portal-deployment.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   helm/Chart.yaml

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

@mergify mergify bot added the conflicts label Jan 17, 2025
@mergify mergify bot requested review from a team as code owners January 17, 2025 11:18
Copy link
Contributor Author

mergify bot commented Jan 17, 2025

Cherry-pick of 542f89a has failed:

On branch mergify/bp/master/pr-10444
Your branch is up to date with 'origin/master'.

You are currently cherry-picking commit 542f89a359.
  (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:   helm/templates/portal/portal-configmap.yaml
	modified:   helm/templates/portal/portal-deployment.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   helm/Chart.yaml

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

…tenant installations

(cherry picked from commit 542f89a)
@Okhelifi Okhelifi force-pushed the mergify/bp/master/pr-10444 branch from 7444b2c to 420fad6 Compare January 17, 2025 11:25
@Okhelifi Okhelifi merged commit 4202c62 into master Jan 17, 2025
5 checks passed
@Okhelifi Okhelifi deleted the mergify/bp/master/pr-10444 branch January 17, 2025 11:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant