Fixes the sort order in GraphQL queries. #17476
Merged
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
MikeAlhayek
approved these changes
Feb 11, 2025
This was referenced Mar 1, 2025
|
/backport to release/2.1 |
|
Started backporting to release/2.1: https://github.com/OrchardCMS/OrchardCore/actions/runs/15026775863 |
|
@MikeAlhayek backporting to "release/2.1" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Fixes the sort order in GraphQL queries.
Using index info to reconstruct a base tree...
M src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentItemsFieldType.cs
M test/OrchardCore.Tests/Apis/GraphQL/ContentManagement/DynamicContentTypeQueryTests.cs
M test/OrchardCore.Tests/Apis/GraphQL/ContentManagement/Recipes/DynamicContentTypeQueryTest.json
Falling back to patching base and 3-way merge...
Auto-merging test/OrchardCore.Tests/Apis/GraphQL/ContentManagement/Recipes/DynamicContentTypeQueryTest.json
Auto-merging test/OrchardCore.Tests/Apis/GraphQL/ContentManagement/DynamicContentTypeQueryTests.cs
CONFLICT (content): Merge conflict in test/OrchardCore.Tests/Apis/GraphQL/ContentManagement/DynamicContentTypeQueryTests.cs
Auto-merging src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentItemsFieldType.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fixes the sort order in GraphQL queries.
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
gvkries
added a commit
that referenced
this pull request
May 14, 2025
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.
Fixes #17475