Skip to content
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 13 commits into from
Mar 31, 2022
Merged

8556 revert pr8454 #8557

merged 13 commits into from
Mar 31, 2022

Conversation

pdurbin
Copy link
Member

@pdurbin pdurbin commented Mar 30, 2022

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:

  • The citation block should look and behave like it does in 5.10.
  • Docs have been reverted to their previous state before the pull request was merged. No "Text" page under the Style Guide, for example. No release note about citation changes.

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.

@kcondon kcondon self-assigned this Mar 31, 2022
@kcondon kcondon merged commit 33e556e into develop Mar 31, 2022
@kcondon kcondon deleted the 8556-revertPR8454 branch March 31, 2022 14:19
@pdurbin pdurbin added this to the 5.10.1 milestone Mar 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants