Copy forward hot-fix changes from production #198
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The code on production currently doesn't match the master branch. It needs to, to make the future envisioned alpha/beta/master server setup work:
https://github.com/KSP-SpaceDock/SpaceDock/wiki/Migration-notes-and-tasks
The commits in this PR are the missing ones from the server. If this is merged, then they'll be synched up again.
NOTE: This includes changes that we do not think should be retained long-term:
redirect()calls with relative paths are changed to hard code a "https://spacedock.info" prefix. If these changes are deployed on a third-party server attempting to re-use the SpaceDock code, that server would break.These changes are included so we can get an exact match between prod and master. We will then create the
alphaandbetabranches for testing changes, so that all three servers would be starting from an identical code base, and then remove that hard coding via the new PR→alpha→beta→master work flow.Added the Need Feedback label since this is just one possible way to approach this, and other ideas are welcome.