Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 099c1562febbcedee63a431b4314654df5e23301 https://github.com/galaxyproject/galaxy/commit/099c1562febbcedee63a431b43146... Author: John Chilton jmchilton@gmail.com Date: 2017-12-13 (Wed, 13 Dec 2017)

Changed paths: M lib/galaxy/tools/actions/upload_common.py M tools/data_source/upload.py

Log Message: ----------- Re-organize edge case upload options for my own clarity.

I think setting each of these variables once and simplifing the context they are used in (in the case of purge_upload) makes it more clear what each variable is and how it is set. I also think one, more detailed comment for each variable helps.

Note: This will break run-as-user uploads started prior to the upgrade to 18.XX and executed after the upgrade. It is a small switch to restore the old behavior but I'm not sure it is worth the complexity it adds to the file.

``` run_as_real_user = dataset.get('run_as_real_user', False) or dataset_get.('in_place', True) ```

Commit: fce9f13eba7f882025885f10c5f613772a93652e https://github.com/galaxyproject/galaxy/commit/fce9f13eba7f882025885f10c5f61... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-12-14 (Thu, 14 Dec 2017)

Changed paths: M lib/galaxy/tools/actions/upload_common.py M tools/data_source/upload.py

Log Message: ----------- Merge pull request #5206 from jmchilton/upload_option_clarify

Re-organize edge case upload options for my own understanding.

Compare: https://github.com/galaxyproject/galaxy/compare/9adfa316913d...fce9f13eba7f