Manually cherry-picked rebasing of @AllanOXDi 's filtersupdate branch #13830
#13860
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
Some significant changes were made in a PR that made some conflicts that were difficult to resolve by picking chunks. I've opted instead to apply the changes from Allan's PR directly onto `develop` after some failed attempts at a regular rebase. This should provide the filters updates expected from his original branch. Co-authored-by: Allan Otodi Opeto <103313919+AllanOXDi@users.noreply.github.com>
github-actions
bot
added
APP: Facility
Contributor
Build Artifacts
|
nucleogenesis
closed this pull request by merging all changes
into
learningequality:develop
in
b323071
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Reimplements #13830 w/out conflicts
Some significant changes were made in a PR that made some conflicts that were difficult to resolve by picking chunks. I've opted instead to apply the changes from Allan's PR directly onto
developafter some failed attempts at a regular rebase. This should provide the filters updates expected from his original branch.References & Reviewer Guidance
Should fix #13696