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.6.x] fix: code preview component fix #10152

Open
wants to merge 1 commit into
base: 4.6.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2024

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


Issue

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

Description

Fix for code preview component

Additional context


📚  View the storybook of this branch here


Cherry-pick of c7cb597 has failed:

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

You are currently cherry-picking commit c7cb597a7c.
  (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:
	new file:   gravitee-apim-console-webui/src/shared/pipes/replace-spaces.pipe.spec.ts
	new file:   gravitee-apim-console-webui/src/shared/pipes/replace-spaces.pipe.ts

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   gravitee-apim-console-webui/src/shared/components/file-preview/file-preview.component.html
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/analytics/model/EnvironmentAnalyticsQueryParameters.java

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

(cherry picked from commit c7cb597)

# Conflicts:
#	gravitee-apim-console-webui/src/shared/components/file-preview/file-preview.component.html
#	gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/analytics/model/EnvironmentAnalyticsQueryParameters.java
@mergify mergify bot requested a review from a team as a code owner December 16, 2024 16:26
@mergify mergify bot added the conflicts label Dec 16, 2024
Copy link
Contributor Author

mergify bot commented Dec 16, 2024

Cherry-pick of c7cb597 has failed:

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

You are currently cherry-picking commit c7cb597a7c.
  (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:
	new file:   gravitee-apim-console-webui/src/shared/pipes/replace-spaces.pipe.spec.ts
	new file:   gravitee-apim-console-webui/src/shared/pipes/replace-spaces.pipe.ts

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   gravitee-apim-console-webui/src/shared/components/file-preview/file-preview.component.html
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/apim/core/analytics/model/EnvironmentAnalyticsQueryParameters.java

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

Copy link
Contributor

@pes-spyro-soft-com pes-spyro-soft-com left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not ready

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