Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: ebb7be8d0ec3944eb945f5cc6e57087328e69d5e https://github.com/galaxyproject/galaxy/commit/ebb7be8d0ec3944eb945f5cc6e570... Author: Martin Cech <marten@bx.psu.edu> Date: 2018-03-13 (Tue, 13 Mar 2018) Changed paths: M doc/source/releases/18.01_announce.rst Log Message: ----------- Merge pull request #5688 from martenson/security-rn [18.01] backport add security announcement to the release notes Commit: be02063c3fbec79a7e146ef87dbc6e99c80e7754 https://github.com/galaxyproject/galaxy/commit/be02063c3fbec79a7e146ef87dbc6... Author: Jelle Scholtalbers <j.scholtalbers@gmail.com> Date: 2018-03-16 (Fri, 16 Mar 2018) Changed paths: M lib/galaxy/security/__init__.py Log Message: ----------- Set the role type to SYSTEM for auto generated roles, which is similar to the default behavior Commit: c58ca749c26bbb3c4ca8750f2c37fd1bb6bd7999 https://github.com/galaxyproject/galaxy/commit/c58ca749c26bbb3c4ca8750f2c37f... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2018-03-16 (Fri, 16 Mar 2018) Changed paths: M lib/galaxy/security/__init__.py Log Message: ----------- Merge pull request #5709 from scholtalbers/fix/default_ldap_role_type [18.01] Fix/default role type on auto created roles Commit: d5d1e4b80d84ebafccfd1e8cc642dbcd1f020d55 https://github.com/galaxyproject/galaxy/commit/d5d1e4b80d84ebafccfd1e8cc642d... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2018-03-19 (Mon, 19 Mar 2018) Changed paths: M doc/source/admin/nginx.md Log Message: ----------- Clarfify that nginx-extras needs to be install for the upload_store directive to work Commit: 127d7b8c3c854db7a28c761aee0c3f2d2e211a6e https://github.com/galaxyproject/galaxy/commit/127d7b8c3c854db7a28c761aee0c3... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2018-03-19 (Mon, 19 Mar 2018) Changed paths: M doc/source/admin/nginx.md Log Message: ----------- Merge pull request #5717 from mvdbeek/nginx_doc_update [18.01] Clarify that nginx-extras needs to be install for the upload_store d… Commit: 3b87dac78028846a803e33ae13199535c70f567d https://github.com/galaxyproject/galaxy/commit/3b87dac78028846a803e33ae13199... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-03-19 (Mon, 19 Mar 2018) Changed paths: M scripts/cleanup_datasets/admin_cleanup_datasets.py M scripts/cleanup_datasets/update_dataset_size.py Log Message: ----------- Add Galaxy `lib` directory to Python path for 2 scripts Also fix check introduced in commit 0763cab37a818a9252a01a7aa387b1fecc07d17e . Fix https://github.com/galaxyproject/galaxy/issues/5722 . Commit: 5dcd9ed0255c4c0bcf41059c79bfb912337ed009 https://github.com/galaxyproject/galaxy/commit/5dcd9ed0255c4c0bcf41059c79bfb... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2018-03-19 (Mon, 19 Mar 2018) Changed paths: M scripts/cleanup_datasets/admin_cleanup_datasets.py M scripts/cleanup_datasets/update_dataset_size.py Log Message: ----------- Merge pull request #5725 from nsoranzo/release_17.09_fix_cleanup_scripts [17.09] Add Galaxy `lib` directory to Python path for 2 scripts Commit: 74d0bcb353b4824d4d4af9ffe6bd909924feca62 https://github.com/galaxyproject/galaxy/commit/74d0bcb353b4824d4d4af9ffe6bd9... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-03-19 (Mon, 19 Mar 2018) Changed paths: M scripts/cleanup_datasets/admin_cleanup_datasets.py M scripts/cleanup_datasets/update_dataset_size.py Log Message: ----------- Merge branch 'release_17.09' into release_18.01 Commit: 0cf88623ee3648a36ba6fd8c9be23fb07d9fc4ac https://github.com/galaxyproject/galaxy/commit/0cf88623ee3648a36ba6fd8c9be23... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-03-19 (Mon, 19 Mar 2018) Changed paths: M doc/source/admin/nginx.md M lib/galaxy/security/__init__.py M scripts/cleanup_datasets/admin_cleanup_datasets.py M scripts/cleanup_datasets/update_dataset_size.py Log Message: ----------- Merge branch 'release_18.01' into dev Compare: https://github.com/galaxyproject/galaxy/compare/66ce5ec83332...0cf88623ee36