Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 8f1d3cac8d4506053d252687194962b7ee81538d https://github.com/galaxyproject/galaxy/commit/8f1d3cac8d4506053d25268719496... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M lib/galaxy/webapps/tool_shed/controllers/repository.py Log Message: ----------- Dedupe one of the worse offenders Commit: 5415e295ac4bf00e9ed9a903ae908c06f57ee0d4 https://github.com/galaxyproject/galaxy/commit/5415e295ac4bf00e9ed9a903ae908... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M lib/galaxy/jobs/deferred/__init__.py M lib/galaxy/jobs/transfer_manager.py Log Message: ----------- Refactor sleeper duplications Commit: 673c1cdbca1ce3bf9ce561c3041d5fa33a8275e8 https://github.com/galaxyproject/galaxy/commit/673c1cdbca1ce3bf9ce561c3041d5... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M lib/galaxy/security/__init__.py Log Message: ----------- Refactor identical role queries into a single function Commit: a71ac4ee3144e1463064730a297627c9797382f6 https://github.com/galaxyproject/galaxy/commit/a71ac4ee3144e1463064730a29762... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/reports/buildapp.py M lib/galaxy/webapps/tool_shed/buildapp.py A lib/galaxy/webapps/util.py Log Message: ----------- Refactor copy-pasted function into separate module Commit: 7cd241f0d9dfb0d4b20bd1c3902a1405258f682d https://github.com/galaxyproject/galaxy/commit/7cd241f0d9dfb0d4b20bd1c3902a1... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M lib/galaxy/jobs/deferred/__init__.py M lib/galaxy/jobs/transfer_manager.py M lib/galaxy/security/__init__.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/reports/buildapp.py M lib/galaxy/webapps/tool_shed/buildapp.py A lib/galaxy/webapps/util.py Log Message: ----------- Merge branch 'big-dedup' into deduplication Commit: 1a2413f8793dee35ae237003f743ac80df17ef74 https://github.com/galaxyproject/galaxy/commit/1a2413f8793dee35ae237003f743a... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M lib/galaxy/webapps/reports/controllers/jobs.py Log Message: ----------- Refactor duplicate calculation code in reports Commit: 6dd4b2b11f14882e3d129261de950e6b61e5bbc0 https://github.com/galaxyproject/galaxy/commit/6dd4b2b11f14882e3d129261de950... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M lib/galaxy/webapps/tool_shed/controllers/repository.py Log Message: ----------- Correct copy-pasted typo Commit: 28143581d9270dc880433dd80687a47076d9ccd1 https://github.com/galaxyproject/galaxy/commit/28143581d9270dc880433dd80687a... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M lib/galaxy/webapps/reports/buildapp.py M lib/galaxy/webapps/tool_shed/buildapp.py Log Message: ----------- Make flake8 happy Commit: 1aa7ef12ec88e469f5e635b9c28cd4f9055ceb33 https://github.com/galaxyproject/galaxy/commit/1aa7ef12ec88e469f5e635b9c28cd... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_util.py M lib/tool_shed/scripts/bootstrap_tool_shed/create_user_with_api_key.py Log Message: ----------- Refactor into a single method and flake Commit: a437083d429f605485745ce82b19c4825c57c161 https://github.com/galaxyproject/galaxy/commit/a437083d429f605485745ce82b19c... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M lib/galaxy/util/topsort.py Log Message: ----------- refactor completely duplicated numpreds/successor processing Commit: 15edae24c8e3fae058aa7c7d017d47467febb5ff https://github.com/galaxyproject/galaxy/commit/15edae24c8e3fae058aa7c7d017d4... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-03 (Thu, 03 Sep 2015) Changed paths: M lib/galaxy/util/topsort.py Log Message: ----------- Fix formatting error Commit: 5fc366f7f7fa1231b2c1c643f2e3ff4bae2d26de https://github.com/galaxyproject/galaxy/commit/5fc366f7f7fa1231b2c1c643f2e3f... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-04 (Fri, 04 Sep 2015) Changed paths: M lib/galaxy/security/__init__.py Log Message: ----------- Correct typo'd _get_roles function Commit: 060fdffda8b2d4b0c7aad3e460248b3793fdb69d https://github.com/galaxyproject/galaxy/commit/060fdffda8b2d4b0c7aad3e460248... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-04 (Fri, 04 Sep 2015) Changed paths: M lib/galaxy/webapps/util.py Log Message: ----------- Correct import for @nsoranzo Commit: d3fa5066ca6e9ee23a25427050d3573f522bb1e0 https://github.com/galaxyproject/galaxy/commit/d3fa5066ca6e9ee23a25427050d35... Author: Nicola Soranzo <nicola.soranzo@tgac.ac.uk> Date: 2015-09-07 (Mon, 07 Sep 2015) Changed paths: M lib/galaxy/webapps/util.py Log Message: ----------- Fix wrong local import of galaxy. Commit: f2d7917cfca995ba6c8ea77e0475360b59496576 https://github.com/galaxyproject/galaxy/commit/f2d7917cfca995ba6c8ea77e04753... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-07 (Mon, 07 Sep 2015) Changed paths: M lib/galaxy/webapps/util.py Log Message: ----------- Merge pull request #8 from nsoranzo/fix_for_erasche Fix wrong local import of galaxy. Commit: 1f3486cb517a54c7dd9ae4a8c9020d07745774f6 https://github.com/galaxyproject/galaxy/commit/1f3486cb517a54c7dd9ae4a8c9020... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-07 (Mon, 07 Sep 2015) Changed paths: M lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_util.py Log Message: ----------- Initialized variables Commit: d95b1cd37a564f6f72e6bfc453b09ed010c3e19a https://github.com/galaxyproject/galaxy/commit/d95b1cd37a564f6f72e6bfc453b09... Author: Eric Rasche <rasche.eric@gmail.com> Date: 2015-09-07 (Mon, 07 Sep 2015) Changed paths: M lib/galaxy/webapps/util.py Log Message: ----------- Merge branch 'deduplication' of github.com:erasche/galaxy into deduplication Commit: 17d8e15e4ee696610799a46abdf3d0379e9d23d5 https://github.com/galaxyproject/galaxy/commit/17d8e15e4ee696610799a46abdf3d... Author: John Chilton <jmchilton@gmail.com> Date: 2015-09-14 (Mon, 14 Sep 2015) Changed paths: M lib/galaxy/jobs/deferred/__init__.py M lib/galaxy/jobs/transfer_manager.py M lib/galaxy/security/__init__.py M lib/galaxy/util/topsort.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/reports/buildapp.py M lib/galaxy/webapps/reports/controllers/jobs.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/controllers/repository.py A lib/galaxy/webapps/util.py M lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_util.py M lib/tool_shed/scripts/bootstrap_tool_shed/create_user_with_api_key.py Log Message: ----------- Merge remote-tracking branch 'erasche/deduplication' into deduplication-merge Conflicts: lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_util.py lib/tool_shed/scripts/bootstrap_tool_shed/create_user_with_api_key.py Commit: 57634f43ea4ed82bf2603df80545604d795e3896 https://github.com/galaxyproject/galaxy/commit/57634f43ea4ed82bf2603df805456... Author: John Chilton <jmchilton@gmail.com> Date: 2015-09-14 (Mon, 14 Sep 2015) Changed paths: M lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_util.py M lib/tool_shed/scripts/bootstrap_tool_shed/create_user_with_api_key.py Log Message: ----------- Fix lint problems from merge. How did that happen, those pieces of code were largely unrelated. Ekkk... Commit: ba25057922594b1d2878ccf5e96dd83ffc0843a3 https://github.com/galaxyproject/galaxy/commit/ba25057922594b1d2878ccf5e96dd... Author: John Chilton <jmchilton@gmail.com> Date: 2015-09-14 (Mon, 14 Sep 2015) Changed paths: M lib/galaxy/jobs/deferred/__init__.py M lib/galaxy/jobs/transfer_manager.py M lib/galaxy/security/__init__.py M lib/galaxy/util/topsort.py M lib/galaxy/webapps/galaxy/buildapp.py M lib/galaxy/webapps/reports/buildapp.py M lib/galaxy/webapps/reports/controllers/jobs.py M lib/galaxy/webapps/tool_shed/buildapp.py M lib/galaxy/webapps/tool_shed/controllers/repository.py A lib/galaxy/webapps/util.py M lib/tool_shed/scripts/bootstrap_tool_shed/bootstrap_util.py M lib/tool_shed/scripts/bootstrap_tool_shed/create_user_with_api_key.py Log Message: ----------- Merge pull request #694 from erasche/deduplication Deduplication PR Compare: https://github.com/galaxyproject/galaxy/compare/1ba64709e668...ba2505792259