Skip to content

Backport of docs: Change heading to filename in CodeBlockConfig into release/1.15.x#18968

Merged
blake merged 1 commit into
release/1.15.xfrom
backport/docs/change-codeblockconfig-heading-filename-named-files/humbly-romantic-lionfish
Sep 21, 2023
Merged

Backport of docs: Change heading to filename in CodeBlockConfig into release/1.15.x#18968
blake merged 1 commit into
release/1.15.xfrom
backport/docs/change-codeblockconfig-heading-filename-named-files/humbly-romantic-lionfish

Conversation

@hc-github-team-consul-core
Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #18951 to be assessed for backporting due to the inclusion of the label backport/1.15.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@blake
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Description

Change various CodeBlockConfig objects to use the filename attribute instead of heading when the code block references a named file.

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/docs/change-codeblockconfig-heading-filename-named-files/humbly-romantic-lionfish branch from 3e95cf8 to 8ad79aa Compare September 21, 2023 22:16
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Sep 21, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@blake blake force-pushed the backport/docs/change-codeblockconfig-heading-filename-named-files/humbly-romantic-lionfish branch from 94828f9 to a3d77a1 Compare September 21, 2023 23:15
@blake blake marked this pull request as ready for review September 21, 2023 23:19
@blake blake requested a review from a team as a code owner September 21, 2023 23:19
Copy link
Copy Markdown
Contributor

@boruszak boruszak left a comment

Choose a reason for hiding this comment

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

LGTM!

Approving on behalf of consul-docs

@blake blake merged commit c0b41f8 into release/1.15.x Sep 21, 2023
@blake blake deleted the backport/docs/change-codeblockconfig-heading-filename-named-files/humbly-romantic-lionfish branch September 21, 2023 23:24
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.

5 participants