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.

Sign up for GitHub

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

Jump to bottom

[docs] fix direct branch injection into docs links #116794

Merged
merged 6 commits into from
Nov 2, 2021
Merged

[docs] fix direct branch injection into docs links #116794

merged 6 commits into from
Nov 2, 2021

Conversation

spalger
Copy link
Contributor

@spalger spalger commented Oct 29, 2021

There are a few places were we are building docs links without using the DocsLinks service fixed by #116665.

Tagged each occurrence that should be reverted with // TODO: remove when docs support "main" so we can find them easily later.

cc @gtback

@spalger spalger added Team:Operations Team label for Operations Team release_note:skip Skip the PR/issue when compiling release notes v8.1.0 labels Oct 29, 2021
@spalger spalger force-pushed the fix/docs-links-not-using-service branch from fe34f7a to a712b43 Compare October 29, 2021 19:13
@spalger
Copy link
Contributor Author

spalger commented Oct 29, 2021

@elasticmachine merge upstream

@spalger spalger marked this pull request as ready for review October 29, 2021 22:07
@spalger spalger requested review from a team as code owners October 29, 2021 22:07
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

jportner
jportner approved these changes Nov 1, 2021
View reviewed changes
Copy link
Contributor

@jportner jportner left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Security changes LGTM (note there appears to be merge conflicts now)

@botelastic botelastic bot added the Team:APM All issues that need APM UI Team support label Nov 1, 2021
@elasticmachine
Copy link
Contributor

Pinging @elastic/apm-ui (Team:apm)

YulNaumenko
YulNaumenko approved these changes Nov 1, 2021
View reviewed changes
Copy link
Contributor

@YulNaumenko YulNaumenko left a comment

Choose a reason for hiding this comment

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

LGTM

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

sorenlouv
sorenlouv approved these changes Nov 1, 2021
View reviewed changes
Copy link
Member

@sorenlouv sorenlouv left a comment

Choose a reason for hiding this comment

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

apm changes lgtm

jloleysens
jloleysens approved these changes Nov 2, 2021
View reviewed changes
Copy link
Contributor

@jloleysens jloleysens left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM, do we have an issue for tracking when docs will support master main?

@spalger
Copy link
Contributor Author

spalger commented Nov 2, 2021 •
edited
Loading

@jloleysens I don't know, but I hoped that cc'ing @gtback would help make sure these are updated at that time.

@spalger spalger merged commit 2a74c29 into elastic:main Nov 2, 2021
@spalger spalger deleted the fix/docs-links-not-using-service branch November 2, 2021 20:02
@spalger spalger added the auto-backport Deprecated - use backport:version if exact versions are needed label Nov 2, 2021
@kibanamachine
Copy link
Contributor

💔 Backport failed

The backport operation could not be completed due to the following error:
There are no branches to backport to. Aborting.

The backport PRs will be merged automatically after passing CI.

To backport manually run:
node scripts/backport --pr 116794

@spalger spalger added v8.0.0 auto-backport Deprecated - use backport:version if exact versions are needed and removed auto-backport Deprecated - use backport:version if exact versions are needed labels Nov 2, 2021
kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Nov 2, 2021
@spalger @kibanamachine
[docs] fix direct branch injection into docs links (elastic#116794)
d935090 
* [docs] fix direct branch injection into docs links

* add one more todo

* correct fallback branch

Co-authored-by: spalger <[email protected]>
Co-authored-by: Kibana Machine <[email protected]>
@kibanamachine kibanamachine mentioned this pull request Nov 2, 2021
Merged
@kibanamachine
Copy link
Contributor

💚 Backport successful

Status Branch Result
✅ 8.0

This backport PR will be merged automatically after passing CI.

@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Nov 3, 2021
@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.

@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Nov 3, 2021
kibanamachine added a commit that referenced this pull request Nov 3, 2021
@kibanamachine @spalger
[docs] fix direct branch injection into docs links (#116794) (#117230)
41ed6e8 
* [docs] fix direct branch injection into docs links

* add one more todo

* correct fallback branch

Co-authored-by: spalger <[email protected]>
Co-authored-by: Kibana Machine <[email protected]>

Co-authored-by: Spencer <[email protected]>
Co-authored-by: spalger <[email protected]>
@gtback gtback mentioned this pull request Nov 5, 2021
Open
@gtback
Copy link
Member

gtback commented Nov 5, 2021

@jloleysens I don't know, but I hoped that cc'ing @gtback would help make sure these are updated at that time.

Thanks, I added an explicit note to elastic/docs#2264 so I don't forget about this!

@jportner jportner mentioned this pull request May 18, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sorenlouv sorenlouv sorenlouv approved these changes

@jportner jportner jportner approved these changes

@jloleysens jloleysens jloleysens approved these changes

@YulNaumenko YulNaumenko YulNaumenko approved these changes

Assignees
No one assigned
Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes Team:APM All issues that need APM UI Team support Team:Operations Team label for Operations Team v8.0.0 v8.1.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@spalger @elasticmachine @kibanamachine @gtback @sorenlouv @jportner @jloleysens @YulNaumenko