-
Notifications
You must be signed in to change notification settings - Fork 495
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
8556 revert pr8454 #8557
Merged
Merged
8556 revert pr8454 #8557
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
This reverts commit 0272629.
This reverts commit 8c30101.
This reverts commit 6177cd9.
This reverts commit ef426e3.
This reverts commit 86f5f74.
This reverts commit 745b934.
This reverts commit cc47538.
This reverts commit 16bc1fa.
This reverts commit 1c27f07.
This reverts commit f701aad.
This reverts commit 1d1a4de.
This reverts commit 5008143.
scolapasta
approved these changes
Mar 30, 2022
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.
What this PR does / why we need it:
By merging this pull request we'll go back to a state before PR #8454 about citation field improvements was merged. This will fix failing integration tests and mean that when upgrading you will not need to reload citation.tsv
Which issue(s) this PR closes:
Special notes for your reviewer:
I decided to use the technique of reverting each individual commit in reverse order, skipping the merge commits. Here's the output from
git log --oneline
showing the commit on develop I started with c9d9971.58c9cc7 Revert "Update citation.tsv" #8556
afa7820 Revert "Update Bundle.properties" #8556
4a9cb8e Revert "Update citation.properties" #8556
2edb7e3 Revert "Testing" #8556
59fe3f8 Revert "Update index.rst" #8556
db4db8d Revert "Creating Text page for textual style guides, with metadata text guidelines section" #8556
a149b88 Revert "Adding Text page to the Style Guide's table of contents" #8556
a912990 Revert "Update metadatacustomization.rst" #8556
767eee5 Revert "Update text.rst" #8556
b7eda36 Revert "Updating link to the Google Doc that has the guidelines" #8556
976f733 Revert "Realigning #controlledVocabulary column headers" #8556
1cf8238 Revert "Create 8127-citation-field-improvements.md" #8556
3597d9d Revert "Update 8127-citation-field-improvements.md" #8556
c9d9971 Merge pull request #8521 from ErykKul/8519_search_in_dropdowns
Suggestions on how to test this:
Does this PR introduce a user interface change? If mockups are available, please link/include them here:
Yes, the citation block should be back to its 5.10 state.
Is there a release notes update needed for this change?:
No.
Additional documentation:
None.