[master-toolshed] merge-in release_16.07 changes #3037
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Moves templating to render (and updates dom node attributes after) to reset modal and prevent inline styling and other modifications to the singleton from persisting between calls to show.
* Fix the cause of toolshed test 1400 failing. * Fix handling of repositories without tool dependencies. * Fix tool dependency retrieval. In some cases, a process might attempt to fetch tool dependencies for revision 1:7334f6d0ac17, but the repository has been updated, and tool dependency metadata has been reassigned to e.g. 7:ce22ceec214a. This commit resolves that issue. * Correct the logic that returns an empty string for an empty dict. * Fix getting latest revision with tool dependencies. * Use self.app instead of trans.app Conflicts: lib/galaxy/webapps/tool_shed/controllers/repository.py
… into release_16.04
Updates metadata column checkbox flag from 'true' to '__NOTHING__' to reflect newer form_builder values. Fixes #2175
[16.04] backport of model tool dependencies fix
Conflicts: lib/galaxy/webapps/tool_shed/controllers/repository.py lib/galaxy/webapps/tool_shed/model/__init__.py
[16.07] Fix missing import in whoosh indexing script
[16.07] Fix optional flag for library datasets in legacy library ui
[16.07] UI, datasets: fix optional column form values
[16.07] UI, Modal: re-build dom on render
Small fixes to conda_faq.rst changes
[16.07] Conda FAQ polish
(cherry picked from commit 9246b86)
This should prevent missing `activate` in <conda_prefix>/bin when downgrading to 3.19.3. This is what the conda people use in their CI environment ( [see](https://github.com/conda/conda/blob/master/utils/travis-run-install.sh#L61) and perhaps why that bug made it into the release in the first place).
[16.01] Backport #2869 Fix initial conda version at 4.0.5
[16.07] Fix setting conda_copy_dependencies in galaxy.ini.
Some bioconda recipes now depend on conda forge, this fix is needed for them to work properly.
[16.07] Fix for bioconda recipes depending on conda-forge.
… on OSX images now
[16.04] Remove travis-ci python installation, since python2.7 is preinstalled…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.