Skip to content

Conversation

@pabel-rh
Copy link
Member

@pabel-rh pabel-rh commented Oct 6, 2025

IMPORTANT: Do Not Merge - To be merged by Docs Team Only

Version(s):
main, 1.7.x
Issue:
RHIDP-9010
Preview:

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Oct 6, 2025

Copy link
Member

@jmagak jmagak left a comment

Choose a reason for hiding this comment

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

lgtm

@jmagak
Copy link
Member

jmagak commented Oct 9, 2025

/cherry-pick release-1.7

@jmagak jmagak merged commit 65a1317 into redhat-developer:main Oct 9, 2025
3 checks passed
@jmagak
Copy link
Member

jmagak commented Oct 9, 2025

/cherry-pick release-1.7

@openshift-cherrypick-robot
Copy link
Contributor

@jmagak: #1426 failed to apply on top of branch "release-1.7":

Applying: AEM-related changes
Using index info to reconstruct a base tree...
M	assemblies/assembly-configuring-the-quickstarts.adoc
M	assemblies/assembly-customizing-the-appearance.adoc
M	modules/configuring-a-floating-action-button/proc-configuring-floating-action-button-as-a-dynamic-plugin.adoc
M	modules/configuring-the-global-header/con-quicklinks-and-starred-items-in-global-header.adoc
M	modules/configuring-the-global-header/proc-configuring-logo-in-the-global-header.adoc
M	modules/configuring-the-global-header/proc-customize-rhdh-global-header.adoc
M	modules/configuring-the-global-header/proc-displaying-preferred-username-in-profile-drop-down.adoc
M	modules/configuring-the-global-header/proc-enabling-logo-in-the-sidebar.adoc
A	modules/configuring-the-global-header/ref-mount-points.adoc
M	modules/configuring-the-quickstarts/proc-customize-rhdh-quickstart.adoc
M	modules/customizing-the-appearance/con-customize-rhdh-sidebar-menuitems.adoc
M	modules/customizing-the-appearance/proc-configuring-dynamic-plugin-menuitem.adoc
M	modules/customizing-the-appearance/proc-customize-rhdh-branding-logo.adoc.git/rebase-apply/patch:502: trailing whitespace.
The Quickstart plugin is pre-loaded in {product-short} with basic configuration properties, and enabled by default. 
.git/rebase-apply/patch:548: trailing whitespace.
        <menu_item_name>: 
.git/rebase-apply/patch:549: trailing whitespace.
          icon: # home | group | category | extension | school | _<my_icon>_ 
.git/rebase-apply/patch:558: trailing whitespace.
`_<plugin_name>_`:: 
.git/rebase-apply/patch:564: trailing whitespace.
`icon`:: 
warning: squelched 15 whitespace errors
warning: 20 lines add whitespace errors.

M	modules/customizing-the-appearance/proc-customize-rhdh-page-theme.adoc
M	modules/customizing-the-appearance/proc-customize-rhdh-palette.adoc
M	modules/customizing-the-appearance/proc-customize-rhdh-theme-mode.adoc
M	modules/customizing-the-appearance/proc-loading-custom-theme-using-dynamic-plugin.adoc
M	modules/customizing-the-appearance/proc-modifying-or-adding-rhdh-custom-menuitem.adoc
M	modules/customizing-the-home-page/proc-customizing-the-home-page-cards.adoc
M	modules/customizing-the-quick-access-card/proc-using-a-dedicated-service-to-provide-data-to-the-quick-access-card.adoc
M	modules/software-catalogs/proc-registering-components-manually-in-the-rhdh-instance.adoc
M	modules/software-catalogs/proc-starring-components-in-the-software-catalog.adoc
M	modules/software-catalogs/proc-updating-components-in-the-software-catalog.adoc
M	modules/software-catalogs/proc-viewing-software-catalog-yaml.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/software-catalogs/proc-viewing-software-catalog-yaml.adoc
Auto-merging modules/software-catalogs/proc-updating-components-in-the-software-catalog.adoc
Auto-merging modules/software-catalogs/proc-starring-components-in-the-software-catalog.adoc
Auto-merging modules/software-catalogs/proc-registering-components-manually-in-the-rhdh-instance.adoc
Auto-merging modules/customizing-the-quick-access-card/proc-using-a-dedicated-service-to-provide-data-to-the-quick-access-card.adoc
Auto-merging modules/customizing-the-home-page/proc-customizing-the-home-page-cards.adoc
Auto-merging modules/customizing-the-appearance/proc-modifying-or-adding-rhdh-custom-menuitem.adoc
CONFLICT (content): Merge conflict in modules/customizing-the-appearance/proc-modifying-or-adding-rhdh-custom-menuitem.adoc
Auto-merging modules/customizing-the-appearance/proc-loading-custom-theme-using-dynamic-plugin.adoc
Auto-merging modules/customizing-the-appearance/proc-customize-rhdh-theme-mode.adoc
Auto-merging modules/customizing-the-appearance/proc-customize-rhdh-palette.adoc
Auto-merging modules/customizing-the-appearance/proc-customize-rhdh-page-theme.adoc
Auto-merging modules/customizing-the-appearance/proc-customize-rhdh-branding-logo.adoc
Auto-merging modules/customizing-the-appearance/proc-configuring-dynamic-plugin-menuitem.adoc
CONFLICT (content): Merge conflict in modules/customizing-the-appearance/proc-configuring-dynamic-plugin-menuitem.adoc
Auto-merging modules/customizing-the-appearance/con-customize-rhdh-sidebar-menuitems.adoc
CONFLICT (content): Merge conflict in modules/customizing-the-appearance/con-customize-rhdh-sidebar-menuitems.adoc
Auto-merging modules/configuring-the-quickstarts/proc-customize-rhdh-quickstart.adoc
CONFLICT (content): Merge conflict in modules/configuring-the-quickstarts/proc-customize-rhdh-quickstart.adoc
Auto-merging modules/configuring-the-global-header/proc-mount-points.adoc
Auto-merging modules/configuring-the-global-header/proc-enabling-logo-in-the-sidebar.adoc
Auto-merging modules/configuring-the-global-header/proc-displaying-preferred-username-in-profile-drop-down.adoc
Auto-merging modules/configuring-the-global-header/proc-customize-rhdh-global-header.adoc
Auto-merging modules/configuring-the-global-header/proc-configuring-logo-in-the-global-header.adoc
Auto-merging modules/configuring-the-global-header/con-quicklinks-and-starred-items-in-global-header.adoc
Auto-merging modules/configuring-a-floating-action-button/proc-configuring-floating-action-button-as-a-dynamic-plugin.adoc
CONFLICT (content): Merge conflict in modules/configuring-a-floating-action-button/proc-configuring-floating-action-button-as-a-dynamic-plugin.adoc
Auto-merging assemblies/assembly-customizing-the-appearance.adoc
Auto-merging assemblies/assembly-configuring-the-quickstarts.adoc
CONFLICT (content): Merge conflict in assemblies/assembly-configuring-the-quickstarts.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 AEM-related changes

In response to this:

/cherry-pick release-1.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

jmagak pushed a commit to jmagak/red-hat-developers-documentation-rhdh that referenced this pull request Oct 9, 2025
Update the disconnected environment

Apply suggestions

Apply suggestions

RHIDP-8630: Added notification during software template version update (redhat-developer#1431)

* Added notification during software template version update

* Incorporated Diana's comments

* Incorporated Judy's comments

RHIDP-9010: AEM-related changes (redhat-developer#1426)

* AEM-related changes

* Minor change Judy's comment

* Incorporated Fabrice's comments

* Incorporated Judy's comments

* Incorporated Fabrice's final comments

RHIDP-8641: Building and Deploying Serverless Workflows (redhat-developer#1416)

* Minor fix

Building and Deploying Serverless Workflows

Building and Deploying Serverless Workflows

Building and Deploying Serverless Workflows

Building and Deploying Serverless Workflows

Building and Deploying Serverless Workflows

Building and Deploying Serverless Workflows

Apply Piotr and Yona's suggestions

Make adjustments

Apply technical reviewers suggestions

Update link

Update the build and deploy section

Minor fix

Building and Deploying Serverless Workflows

* Minor update

* Apply Priyanka's suggestions

* Apply Priyanka's suggestions

* Apply Priyanka's suggestions

---------

Co-authored-by: GitHub Actions <[email protected]>

Apply suggestions

Apply suggestions

Update the disconnected environment
jmagak pushed a commit to jmagak/red-hat-developers-documentation-rhdh that referenced this pull request Oct 9, 2025
Update the disconnected environment

Apply suggestions

Apply suggestions

RHIDP-8630: Added notification during software template version update (redhat-developer#1431)

* Added notification during software template version update

* Incorporated Diana's comments

* Incorporated Judy's comments

RHIDP-9010: AEM-related changes (redhat-developer#1426)

* AEM-related changes

* Minor change Judy's comment

* Incorporated Fabrice's comments

* Incorporated Judy's comments

* Incorporated Fabrice's final comments

RHIDP-8641: Building and Deploying Serverless Workflows (redhat-developer#1416)

* Minor fix

Building and Deploying Serverless Workflows

Building and Deploying Serverless Workflows

Building and Deploying Serverless Workflows

Building and Deploying Serverless Workflows

Building and Deploying Serverless Workflows

Building and Deploying Serverless Workflows

Apply Piotr and Yona's suggestions

Make adjustments

Apply technical reviewers suggestions

Update link

Update the build and deploy section

Minor fix

Building and Deploying Serverless Workflows

* Minor update

* Apply Priyanka's suggestions

* Apply Priyanka's suggestions

* Apply Priyanka's suggestions

---------

Co-authored-by: GitHub Actions <[email protected]>

Apply suggestions

Apply suggestions

Update the disconnected environment
themr0c pushed a commit to themr0c/red-hat-developers-documentation-rhdh that referenced this pull request Oct 13, 2025
* AEM-related changes

* Minor change Judy's comment

* Incorporated Fabrice's comments

* Incorporated Judy's comments

* Incorporated Fabrice's final comments
Gerry-Forde pushed a commit to Gerry-Forde/red-hat-developers-documentation-rhdh-v2 that referenced this pull request Oct 14, 2025
* AEM-related changes

* Minor change Judy's comment

* Incorporated Fabrice's comments

* Incorporated Judy's comments

* Incorporated Fabrice's final comments
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.

5 participants