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: Secure and monitor restructure #3280

Open
wants to merge 8 commits into
base: main
Choose a base branch
from

Conversation

sixhobbits
Copy link
Collaborator

No description provided.

@sixhobbits sixhobbits requested review from a team as code owners September 18, 2024 13:15
@alex-fusionauth
Copy link
Contributor

@sixhobbits please resolve conflicts.

Copy link
Contributor

@synedra synedra left a comment

Choose a reason for hiding this comment

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

Looks like you updated the redirects.json, which is good, but that will only point refs from the Before Time to the new pages, there will also need to be redirects for /secure-and-monitor to /monitor and such

# Conflicts:
#	astro/src/content/json/features.json
@rideam rideam requested a review from a team as a code owner November 1, 2024 06:59
@sixhobbits
Copy link
Collaborator Author

@synedra sorry for the delay - could you clarify what still needs to be done. We do have redirects set up from the secure-and-monitor URLs to the new structure in that same file:

image

@bradmccarty
Copy link
Contributor

@mark-robustelli please see the above discussion and review.

@mark-robustelli
Copy link
Contributor

@synedra It looks to me like the redirects should work. Are we OK to approve this or am I missing something?

synedra
synedra previously approved these changes Feb 5, 2025
Copy link
Contributor

@synedra synedra left a comment

Choose a reason for hiding this comment

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

Looks good now, ship it!

@bradmccarty
Copy link
Contributor

@sixhobbits Sending this back your way for a conflict resolution.

# Conflicts:
#	astro/src/content/docs/operate/secure/token-storage.mdx
@sixhobbits
Copy link
Collaborator Author

@bradmccarty - fixed

@mark-robustelli
Copy link
Contributor

@mooreds , it appears this has branch conflicts and I do not have the permissions to resolve. Do you?

@mooreds
Copy link
Contributor

mooreds commented Feb 19, 2025

Whenever we have branch conflicts with Ritza PRs, there are two options:

  • ask Ritza to resolve them, since they control the fork
  • add the ritza fork as an origin, pull down the branch, push it up as a branch in the fusionauth fusionauth-site repo, then resolve the conflicts from there (not as hard as it sounds). This choice means you end up creating another PR and closing out this one.

# Conflicts:
#	astro/src/content/docs/get-started/run-in-the-cloud/cloud.mdx
#	src/redirects.json
@rideam
Copy link
Collaborator

rideam commented Feb 20, 2025

@mark-robustelli the conflicts are fixed now

@mark-robustelli
Copy link
Contributor

@rideam I am still seeing. "This branch has conflicts that must be resolved."

# Conflicts:
#	astro/src/content/docs/operate/monitor/prometheus.mdx
@rideam
Copy link
Collaborator

rideam commented Feb 20, 2025

@mark-robustelli the merge that happened to main a few minutes ago for the Prometheus guide fab8bab is the one that created more conflicts after I had fixed the prior conflicts. I have fixed the conflicts again but further merges to main may cause more conflicts since this PR has many file changes.

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.

7 participants