1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/2fd8714c4fae/
Changeset: 2fd8714c4fae
User: jmchilton
Date: 2015-01-23 17:11:03+00:00
Summary: Merged in BjoernGruening/galaxy-central-1/toolshed_blacklist_additions (pull request #627)
Add planemo test file to tool shed upoad blacklist.
Affected #: 1 file
diff -r 820114af3bf0689131885c8c99165532902bd2af -r 2fd8714c4faeb580f3ccf1591003f10e821397a1 lib/tool_shed/util/commit_util.py
--- a/lib/tool_shed/util/commit_util.py
+++ b/lib/tool_shed/util/commit_util.py
@@ -18,7 +18,7 @@
log = logging.getLogger( __name__ )
UNDESIRABLE_DIRS = [ '.hg', '.svn', '.git', '.cvs' ]
-UNDESIRABLE_FILES = [ '.hg_archival.txt', 'hgrc', '.DS_Store' ]
+UNDESIRABLE_FILES = [ '.hg_archival.txt', 'hgrc', '.DS_Store', 'tool_test_output.html', 'tool_test_output.json' ]
def check_archive( repository, archive ):
for member in archive.getmembers():
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/e5969ffd8f6b/
Changeset: e5969ffd8f6b
User: carlfeberhard
Date: 2015-01-22 23:55:37+00:00
Summary: Fix bootstrapped user data to use proper escaping (crap...) and allow history/hda tag to autocomplete again
Affected #: 1 file
diff -r fc8e37c905ef95395f3aeb2ea24f52d1a622015f -r e5969ffd8f6b548e064ee57d740e06f03ce7efc2 templates/galaxy_client_app.mako
--- a/templates/galaxy_client_app.mako
+++ b/templates/galaxy_client_app.mako
@@ -83,7 +83,7 @@
users_api_controller = trans.webapp.api_controllers[ 'users' ]
tags_used = []
for tag in users_api_controller.get_user_tags_used( trans, user=trans.user ):
- tag = tag | h
+ tag = escape( tag )
if tag:
tags_used.append( tag )
user_dict[ 'tags_used' ] = tags_used
@@ -106,6 +106,8 @@
except Exception, exc:
pass
+ #TODO: no logging available?
+ #log.exception( exc )
return user_dict
%>
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.