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.

Sign up for GitHub

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

Jump to bottom

MNT Update jest tests for archive text #1379

Merged
merged 1 commit into from
Aug 8, 2023
Merged

MNT Update jest tests for archive text #1379

merged 1 commit into from
Aug 8, 2023

Conversation

emteknetnz
Copy link
Member

@emteknetnz emteknetnz commented Aug 8, 2023 •
edited
Loading

@emteknetnz emteknetnz changed the title Pulls/1.13/archive text jest MNT Update unit tests for archive text Aug 8, 2023
@emteknetnz emteknetnz mentioned this pull request Aug 8, 2023
Closed
@emteknetnz emteknetnz changed the title MNT Update unit tests for archive text MNT Update jest tests for archive text Aug 8, 2023
@emteknetnz emteknetnz force-pushed the pulls/1.13/archive-text-jest branch from 21483f1 to ae5ff1c Compare August 8, 2023 01:04
@emteknetnz emteknetnz mentioned this pull request Aug 8, 2023
Merged
@emteknetnz emteknetnz force-pushed the pulls/1.13/archive-text-jest branch 3 times, most recently from af92dca to 5113f5d Compare August 8, 2023 03:57
@GuySartorelli
Copy link
Member

Merge up failed due to merge conflicts: https://github.com/silverstripe/silverstripe-asset-admin/actions/runs/5792638035/job/15699211485
But I don't think that holds this PR up in any way. Please rebase so that the only commit is the new changes.

@emteknetnz emteknetnz marked this pull request as ready for review August 8, 2023 04:23
@emteknetnz emteknetnz force-pushed the pulls/1.13/archive-text-jest branch from 5113f5d to f824192 Compare August 8, 2023 04:25
@emteknetnz
Copy link
Member Author

Have rebased

@GuySartorelli
Copy link
Member

Please resolve the merge conflict

@emteknetnz emteknetnz force-pushed the pulls/1.13/archive-text-jest branch from f824192 to 77d49f9 Compare August 8, 2023 22:37
@emteknetnz
Copy link
Member Author

Resolved

GuySartorelli
GuySartorelli approved these changes Aug 8, 2023
View reviewed changes
Copy link
Member

@GuySartorelli GuySartorelli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, works well locally.

@GuySartorelli GuySartorelli merged commit 15b5732 into silverstripe:1.13 Aug 8, 2023
@GuySartorelli GuySartorelli deleted the pulls/1.13/archive-text-jest branch August 8, 2023 23:56
This was referenced Aug 15, 2023
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuySartorelli GuySartorelli GuySartorelli approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@emteknetnz @GuySartorelli