opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_20.01' into dev

Browse Source
This commit is contained in:
Nicola Soranzo
2020-04-21 11:48:14 +01:00
parent c5f5cf7240 5083a84ce8
commit ef0a9c6a5c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/config/sample/datatypes_conf.xml.sample
+5 -1
View File
@@ -398,7 +398,11 @@
<display file="igb/wig.xml"/>
</datatype>
<datatype extension="interval_index" type="galaxy.datatypes.binary:Binary" subclass="true"/>
<datatype extension="odgi" type="galaxy.datatypes.binary:Binary" subclass="true" description="Genomic variation graphs self index used by odgi."/>
<datatype extension="odgi" type="galaxy.datatypes.binary:Binary" subclass="true" description="Genomic variation graphs self index used by odgi." display_in_upload="true"/>
<datatype extension="vg" type="galaxy.datatypes.binary:Binary" subclass="true" description="Genomic variation graphs." display_in_upload="true"/>
<datatype extension="xg" type="galaxy.datatypes.binary:Binary" subclass="true" description="Genomic variation graphs with vg index." display_in_upload="true"/>
<datatype extension="protobuf2" type="galaxy.datatypes.binary:Binary" subclass="true" description="Protocol Buffers (Protobuf) is data format for serializing structured data."/>
<datatype extension="protobuf3" type="galaxy.datatypes.binary:Binary" subclass="true" description="Protocol Buffers (Protobuf) is data format for serializing structured data."/>
<datatype extension="tabix" type="galaxy.datatypes.binary:Binary" subclass="true"/>
<datatype extension="bgzip" type="galaxy.datatypes.binary:Binary" subclass="true"/>
<datatype extension="vcf_bgzip" type="galaxy.datatypes.tabular:VcfGz" display_in_upload="true">
lib/galaxy/web/framework/webapp.py
+1 -1
View File
@@ -251,7 +251,7 @@ class GalaxyWebTransaction(base.DefaultWebTransaction,
self.user = None
self.galaxy_session = None
else:
self.response.send_redirect(url_for(controller='user',
self.response.send_redirect(url_for(controller='root',
action='login',
message="You have been logged out due to inactivity. Please log in again to continue using Galaxy.",
status='info',