-
Notifications
You must be signed in to change notification settings - Fork 4
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
DF-838:ETNA-ROSETTA: DO NOT MERGE UNTIL #1483
Closed
Closed
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
Co-authored-by: JohnHeeryTNA <[email protected]> Co-authored-by: Andrew Hosgood <[email protected]> Co-authored-by: Helen Chapman <[email protected]> Co-authored-by: jamesbiggs <[email protected]> Co-authored-by: janehughes <[email protected]>
Conflicts: templates/whatson/exhibition_page.html Changes to be committed: new file: etna/articles/migrations/0100_remove_focusedarticlepage_author.py modified: etna/articles/models.py modified: etna/authors/models.py new file: etna/whatson/migrations/0008_eventpage_need_to_know_button_link_and_more.py modified: etna/whatson/models.py modified: lint-requirements.txt modified: poetry.lock modified: pyproject.toml modified: sass/etna.scss new file: sass/includes/_useful-info.scss modified: scripts/src/modules/search/global-search.js modified: templates/articles/focused_article_page.html new file: templates/includes/useful-info.html modified: templates/search/blocks/search_landing_hero.html modified: templates/whatson/exhibition_page.html
TNA-Allan
changed the title
ETNA-ROSETTA: DO NOT MERGE YET
DF-838:ETNA-ROSETTA: DO NOT MERGE YET
Dec 6, 2023
TNA-Allan
changed the title
DF-838:ETNA-ROSETTA: DO NOT MERGE YET
DF-838:ETNA-ROSETTA: DO NOT MERGE UNTIL
Dec 6, 2023
Co-authored-by: Andrew Hosgood <[email protected]> Co-authored-by: GitHub Action <[email protected]> Co-authored-by: JohnHeeryTNA <[email protected]>
Conflicts: etna/records/tests/test_urls.py Changes to be committed: modified: .platform.app.yaml modified: config/settings/base.py modified: config/settings/dev.py new file: config/settings/util.py modified: etna/ciim/tests/test_utils.py modified: etna/collections/tests/test_models.py modified: etna/core/tests/test_decorators.py modified: etna/core/tests/test_middleware.py modified: etna/records/tests/test_blocks.py modified: etna/records/tests/test_models.py modified: etna/records/tests/test_urls.py modified: etna/records/tests/test_views.py
Closing this PR as the work will be re-done in the new ds-search repository |
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.
Ticket URL: https://national-archives.atlassian.net/browse/DF-838
DO NOT MERGE UNTIL
About these changes
TODO Before Merges
How to check these changes
Before assigning to reviewer, please make sure you have
Merging PR guidance
Follow docs\developer-guide\contributing.md
Deployment guidance
Follow docs\infra\environments.md