fusionauth-site icon indicating copy to clipboard operation
fusionauth-site copied to clipboard

docs: Secure and monitor restructure

Open sixhobbits opened this issue 1 year ago • 1 comments

sixhobbits avatar Sep 18 '24 13:09 sixhobbits

@sixhobbits please resolve conflicts.

ghost avatar Sep 25 '24 15:09 ghost

@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

sixhobbits avatar Nov 01 '24 10:11 sixhobbits

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

bradmccarty avatar Jan 22 '25 21:01 bradmccarty

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

mark-robustelli avatar Jan 31 '25 15:01 mark-robustelli

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

bradmccarty avatar Feb 10 '25 20:02 bradmccarty

@bradmccarty - fixed

sixhobbits avatar Feb 12 '25 09:02 sixhobbits

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

mark-robustelli avatar Feb 19 '25 22:02 mark-robustelli

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.

mooreds avatar Feb 19 '25 22:02 mooreds

@mark-robustelli the conflicts are fixed now

rideam avatar Feb 20 '25 09:02 rideam

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

mark-robustelli avatar Feb 20 '25 16:02 mark-robustelli

@mark-robustelli the merge that happened to main a few minutes ago for the Prometheus guide https://github.com/FusionAuth/fusionauth-site/commit/fab8bab7bfe4583006f1328f6e9fb6c4ba6ef312 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.

rideam avatar Feb 20 '25 16:02 rideam