This repository has been archived by the owner on Feb 26, 2023. It is now read-only.
Resync with latest production code #2
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
Somehow the production code got out of sync with the version used to initialize this repository. This commit ensures the repo code is in sync with the latest production code while maintaining the changes previously applied to remove hard-coded sensitive information from the source code, as well as to allow MARTI to run from a Docker container.
RoiEXLab
reviewed
Nov 24, 2017
| @@ -0,0 +1,3 @@ | |||
| <FilesMatch "\.(key|dat)$"> | |||
| deny from all | |||
| </FilesMatch> | |||
There was a problem hiding this comment.
I'm not sure if this file is going to affect anything since we're using nginx and not apache.
Note that there were no cleanup changes submitted to this repo since I received the initial zipball back in April. This code is what is currently reflected in production. I assumed that the differences encompassed in this PR were made directly in production (or the zipball I received contained changes never deployed to production). Regardless, I plan on submitting some cleanup PRs, but only after we have a process in place to deploy this version. 😄 |
Closed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR is in preparation of changes that need to be made to debug triplea-game/triplea#2603.
Somehow the production code got out of sync with the version used to initialize this repository. This commit ensures the repo code is in sync with the latest production code while maintaining the changes previously applied to remove hard-coded sensitive information from the source code, as well as to allow MARTI to run from a Docker container.
If you view this PR with whitespace changes ignored (
?w=1), you'll note that a large number of the differences are simply whitespace.