Bring main up to date with Gaddel development #1250
Merged
Conversation
This file contains hidden or 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
Contributor
Author
|
@emgeier I'm assigning you as a reviewer mostly to confirm that this PR won't mess anything up with the GH Actions? |
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.
I have created the ARCHIVE_syriaca-main_pre-Gaddel branch which has the contents of "main"/"master" before we began Gaddel development, integrated CBSS, revised the persons model, etc. This is the latest data that was published using the Srophe app, so we should retain it for archival purposes.
This PR, however, will merge the updates and changes made with Gaddel development, etc. into master. As discussed, we will continue to use
gaddel_developmentfor the short term to feed the build process for the production site. Edits will be made tomasterand then pulled intogaddel_developmentto push these changes to the site.