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

[DOCS] Include docs on permanently unreleased branches only #51743

Merged
merged 1 commit into from
Feb 6, 2020
Merged

[DOCS] Include docs on permanently unreleased branches only #51743

merged 1 commit into from
Feb 6, 2020

Conversation

jrodewig
Copy link
Contributor

Adds the ability to display docs on permanently unreleased branches,
such as master and 7.x.

Also updates how the autoscaling and EQL docs are included.
Currently, these feature-flag docs would display on any unreleased
branches that contain the changes, such as 7.7.

Adds the ability to display docs on permanently unreleased branches,
such as `master` and `7.x`.

Also updates how the autoscaling and EQL docs are included.
Currently, these feature-flag docs would display on any unreleased
branches that contain the changes, such as 7.7.
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-docs (>docs)

@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-distributed (:Distributed/Autoscaling)

@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-search (:Search/EQL)

Comment on lines +64 to +69
ifeval::["{source_branch}"=="master"]
:permanently-unreleased-branch:
endif::[]
ifeval::["{source_branch}"=="{major-version}"]
:permanently-unreleased-branch:
endif::[]
Copy link
Contributor Author

@jrodewig jrodewig Jan 31, 2020

Choose a reason for hiding this comment

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

This is messier than preferred, but Asciidoctor does not currently support complex conditions:
asciidoctor/asciidoctor#1786

@debadair
Copy link
Contributor

Thanks @jrodewig. This is a better user experience and prevents the possibility of 404s from search results for this content.

@jrodewig jrodewig merged commit f21b641 into elastic:master Feb 6, 2020
@jrodewig jrodewig deleted the docs__master-7.x-only branch February 6, 2020 19:44
jrodewig added a commit that referenced this pull request Feb 6, 2020
Adds the ability to display docs on permanently unreleased branches,
such as `master` and `7.x`.

Also updates how the autoscaling and EQL docs are included.
Currently, these feature-flag docs would display on any unreleased
branches that contain the changes, such as 7.7.
@jrodewig
Copy link
Contributor Author

jrodewig commented Feb 6, 2020

Backport commits

master f21b641 c82a050
7.x 9d09796 6fe8f16

jrodewig added a commit that referenced this pull request Feb 7, 2020
jrodewig added a commit that referenced this pull request Feb 7, 2020
jrodewig added a commit that referenced this pull request Feb 11, 2020
Adds the ability to display docs on permanently unreleased branches,
such as `master` and `7.x`.

Also updates how the autoscaling and EQL docs are included.
Currently, these feature-flag docs would display on any unreleased
branches that contain the changes, such as 7.7.
jrodewig added a commit that referenced this pull request Feb 11, 2020
Adds the ability to display docs on permanently unreleased branches,
such as `master` and `7.x`.

Also updates how the autoscaling and EQL docs are included.
Currently, these feature-flag docs would display on any unreleased
branches that contain the changes, such as 7.7.
@jrodewig
Copy link
Contributor Author

jrodewig commented Feb 11, 2020

This PR was reverted with #52066 as a potential solution for #52050. It was then discovered that this PR and that issue were unrelated.

I've re-pushed the original commits for this PR to master and 7.x. This is also reflected in the backport commits comment:
#51743 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants