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

EZP-30782: allow sorting by trashed field #1440

Merged

Conversation

carlosmauri
Copy link
Contributor

@carlosmauri carlosmauri commented Aug 8, 2019

Hi there,

This is a continuation of the work done in here: #1439

I created a new PR because @andrerom asked me to rebase 2019.03 branch but I was having issues. The rebase was complaining about the composer.json. The conflict was easy to fix but some some reason when I was git rebase --continue git was stuck unable to finish the rebase so I created this new branch of 2019.03.

I've also added a new commit with the unit test as requested.

Jira ticket: https://jira.ez.no/browse/EZP-30782

Thanks!

Copy link
Contributor

@andrerom andrerom left a comment

Choose a reason for hiding this comment

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

+1 (failure on PHP 5.5 is not related, it's a travis thing)

@mateuszbieniek
Copy link
Contributor

mateuszbieniek commented Aug 9, 2019

👍

@andrerom andrerom merged commit 0a60562 into ezsystems:2019.03 Aug 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants