1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/7ba09a5bbe9d/
Changeset: 7ba09a5bbe9d
User: carlfeberhard
Date: 2015-02-10 20:12:46+00:00
Summary: Fix to 109da69: remove debugging from index.mako
Affected #: 1 file
diff -r 374318d710755d92b8cea81f34c226ecd60741a5 -r 7ba09a5bbe9d88ca035b44f2178d7d32442cf2e1 templates/webapps/galaxy/root/index.mako
--- a/templates/webapps/galaxy/root/index.mako
+++ b/templates/webapps/galaxy/root/index.mako
@@ -152,12 +152,6 @@
currPanel.connectToQuotaMeter( Galaxy.quotaMeter );
currPanel.loadCurrentHistory();
Galaxy.currHistoryPanel = currPanel;
-
-currPanel.once( 'rendered', function(){
- currPanel.showSelectors();
- currPanel.selectAll();
- _.last( currPanel.actionsPopup.options ).func();
-});
});
});
</script>
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/374318d71075/
Changeset: 374318d71075
User: dannon
Date: 2015-02-10 20:06:12+00:00
Summary: Add reminder for why imports are done this way in s3objectstore for the next time I forget.
Affected #: 1 file
diff -r 2f67cc2049113ace6bccb701c545fd1ec35fb013 -r 374318d710755d92b8cea81f34c226ecd60741a5 lib/galaxy/objectstore/s3.py
--- a/lib/galaxy/objectstore/s3.py
+++ b/lib/galaxy/objectstore/s3.py
@@ -20,6 +20,7 @@
from ..objectstore import ObjectStore, convert_bytes
try:
+ # Imports are done this way to allow objectstore code to be used outside of Galaxy.
import boto
from boto.s3.key import Key
from boto.s3.connection import S3Connection
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/463c8b50dd5a/
Changeset: 463c8b50dd5a
User: dannon
Date: 2015-02-10 19:07:01+00:00
Summary: Followup to PR https://bitbucket.org/galaxy/galaxy-central/pull-request/658/, only continue restarting in the case of a 1 return code from stop_daemon
Affected #: 1 file
diff -r c58911f54093a4b5d963fa70393908d9e701aeaa -r 463c8b50dd5adabbe7c6c594ca367923905a7439 lib/galaxy/util/pastescript/serve.py
--- a/lib/galaxy/util/pastescript/serve.py
+++ b/lib/galaxy/util/pastescript/serve.py
@@ -560,6 +560,10 @@
result = self.stop_daemon()
if result:
print "Could not stop daemon"
+ # It's ok to continue trying to restart if stop_daemon returns
+ # a 1, otherwise shortcut and return.
+ if cmd == 'restart' and result != 1:
+ return result
if cmd == 'stop':
return result
self.options.daemon = True
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.