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] fix: allow hyphen in path mapping #10517

Merged
merged 1 commit into from
Jan 24, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 24, 2025

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


Issue

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

Description

allow hyphen in path mapping

Additional context


📚  View the storybook of this branch here


Cherry-pick of 87965d6 has failed:

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

You are currently cherry-picking commit 87965d6aa5.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-console-webui/src/management/api/analytics/pathMappings/api-path-mappings-add-dialog/api-path-mappings-add-dialog.component.ts

no changes added to commit (use "git add" and/or "git commit -a")

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


📚  View the storybook of this branch here

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

mergify bot commented Jan 24, 2025

Cherry-pick of 87965d6 has failed:

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

You are currently cherry-picking commit 87965d6aa5.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   gravitee-apim-console-webui/src/management/api/analytics/pathMappings/api-path-mappings-add-dialog/api-path-mappings-add-dialog.component.ts

no changes added to commit (use "git add" and/or "git commit -a")

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

@vikrantgravitee vikrantgravitee force-pushed the mergify/bp/master/pr-10516 branch from f93bc38 to 0ba4d43 Compare January 24, 2025 11:58
@vikrantgravitee vikrantgravitee merged commit ea14d2b into master Jan 24, 2025
11 checks passed
@vikrantgravitee vikrantgravitee deleted the mergify/bp/master/pr-10516 branch January 24, 2025 12:13
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