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: Redirect broken links #51615

Closed
wants to merge 7 commits into from
Closed

docs: Redirect broken links #51615

wants to merge 7 commits into from

Conversation

mmcallister
Copy link
Contributor

@mmcallister mmcallister commented Jan 29, 2025 •
edited by ptgott
Loading

Fixes #51609

@mmcallister mmcallister added no-changelog Indicates that a PR does not require a changelog entry backport/branch/v17 labels Jan 29, 2025
@mmcallister mmcallister self-assigned this Jan 29, 2025
@github-actions GitHub Actions
Copy link

github-actions bot commented Jan 29, 2025 •
edited
Loading

Amplify deployment status

Branch Commit Job ID Status Preview Updated (UTC)
redirect_broken_links e43e898 7 ❌FAILED redirect-broken-links 2025-01-30 18:32:49

@mmcallister mmcallister marked this pull request as ready for review January 29, 2025 18:57
@mmcallister mmcallister enabled auto-merge January 29, 2025 19:32
@zmb3
Copy link
Collaborator

zmb3 commented Jan 29, 2025

Looks like you have at least one extra commit here from another PR.

@mmcallister
Copy link
Contributor Author

Thanks @zmb3 Not sure how the other commit got in there, but I removed those changes

@zmb3
Copy link
Collaborator

zmb3 commented Jan 30, 2025

Thanks @zmb3 Not sure how the other commit got in there, but I removed those changes

I still see commit c3ffe0c "removing teleport managed terms" - this doesn't seem related to broken links.

@mmcallister mmcallister force-pushed the redirect_broken_links branch from 9efdd9c to e43e898 Compare January 30, 2025 18:29
@mmcallister
Copy link
Contributor Author

@zmb3 Ok I think I got rid of that sneaky commit for good - https://github.com/gravitational/teleport/pull/51615/commits

ptgott
ptgott reviewed Jan 30, 2025
View reviewed changes
docs/config.json
@@ -298,6 +298,124 @@
"source": "/access-controls/guides/role-templates/",
"destination": "/admin-guides/access-controls/guides/role-templates/",
"permanent": true
},
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like there are some conflict markers left in the config!

@zmb3
Copy link
Collaborator

zmb3 commented Jan 30, 2025

Can we squash these 7 commits into one commit with a nice readable commit message?

Otherwise the auto-merge message is going to have a bunch of unnecessary detail like "adding comma" and "removing commit".

@mmcallister
Copy link
Contributor Author

Closing this due to conflicts and commit hassles I've made a new PR: #51736
I don't see any unneeded commits listed in this one.

auto-merge was automatically disabled January 31, 2025 23:32

Pull request was closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ptgott ptgott ptgott left review comments

@zmb3 zmb3 Awaiting requested review from zmb3

@stevenGravy stevenGravy Awaiting requested review from stevenGravy

@r0mant r0mant Awaiting requested review from r0mant

@hugoShaka hugoShaka Awaiting requested review from hugoShaka

@xinding33 xinding33 Awaiting requested review from xinding33

Assignees

@mmcallister mmcallister

Labels
backport/branch/v17 documentation no-changelog Indicates that a PR does not require a changelog entry size/sm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

docs: v17 and v18 links broken
3 participants
@mmcallister @zmb3 @ptgott