Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 04a901771b59d1fcf8070cd4c4de1f464e304e55 https://github.com/galaxyproject/galaxy/commit/04a901771b59d1fcf8070cd4c4de1... Author: John Chilton <jmchilton@gmail.com> Date: 2018-03-26 (Mon, 26 Mar 2018) Changed paths: M lib/galaxy/webapps/galaxy/api/workflows.py Log Message: ----------- [18.01] Fix SQL query for "workflows shared with me" as part of workflow index. Before and after queries here: https://gist.github.com/jmchilton/dc57bca60178341d9ce0f6cf6d4bd36f You can see that before the joined load of the stored workflow wasn't being registered by SQLalchemy properly and so it was joining that table twice - once using the proper index and another time just walking the whole table. The filter and order by were being applied to the unconditional version - kind of like saying give me all the workflows and the right workflows and I will check all the workflows to see if this one is deleted instead of just the subset of workflows that are actually being shared with the target user. Commit: d6be56256fcbee53509dc867d863819621ef1d08 https://github.com/galaxyproject/galaxy/commit/d6be56256fcbee53509dc867d8638... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-03-27 (Tue, 27 Mar 2018) Changed paths: M lib/galaxy/webapps/galaxy/api/workflows.py Log Message: ----------- Merge pull request #5782 from jmchilton/fix_1801 [18.01] Fix SQL query for "workflows shared with me" as part of workflow index. Commit: 449e25200b2099ddbd253ee7f528ee69e997c2aa https://github.com/galaxyproject/galaxy/commit/449e25200b2099ddbd253ee7f528e... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-03-27 (Tue, 27 Mar 2018) Changed paths: M lib/galaxy/webapps/galaxy/api/workflows.py Log Message: ----------- Merge remote-tracking branch 'upstream/release_18.01' into dev Compare: https://github.com/galaxyproject/galaxy/compare/2558d2780109...449e25200b20