2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/bce30adc75e9/ Changeset: bce30adc75e9 Branch: next-stable User: carlfeberhard Date: 2014-12-09 17:18:31+00:00 Summary: Apply stable 782cf1a to next-stable Affected #: 1 file diff -r 59d5d556b6647c245fc26f331eb01e9d597c698a -r bce30adc75e94c99fc8fd53f3dee75a26b6c8e86 templates/webapps/galaxy/galaxy.masthead.mako --- a/templates/webapps/galaxy/galaxy.masthead.mako +++ b/templates/webapps/galaxy/galaxy.masthead.mako @@ -1,4 +1,4 @@ -<%namespace file="/galaxy_client_app.mako" import="get_user_json" /> +<%namespace file="/galaxy_client_app.mako" import="get_user_dict" /> ## masthead head generator <%def name="load(active_view = None)"> @@ -34,7 +34,7 @@ 'requests' : bool(trans.user and (trans.user.requests or trans.app.security_agent.get_accessible_request_types(trans, trans.user))), 'email' : trans.user.email if (trans.user) else "", 'valid' : bool(trans.user != None), - 'json' : get_user_json() + 'json' : get_user_dict() } } %> https://bitbucket.org/galaxy/galaxy-central/commits/be3f185f9e75/ Changeset: be3f185f9e75 User: carlfeberhard Date: 2014-12-09 17:18:44+00:00 Summary: merge Affected #: 1 file diff -r 33f1bf5be91b6aee2ff0a42d4315b43da0a5da33 -r be3f185f9e75c4a7fc8ecf689ad0d26b98275026 templates/webapps/galaxy/galaxy.masthead.mako --- a/templates/webapps/galaxy/galaxy.masthead.mako +++ b/templates/webapps/galaxy/galaxy.masthead.mako @@ -1,4 +1,4 @@ -<%namespace file="/galaxy_client_app.mako" import="get_user_json" /> +<%namespace file="/galaxy_client_app.mako" import="get_user_dict" /> ## masthead head generator <%def name="load(active_view = None)"> @@ -34,7 +34,7 @@ 'requests' : bool(trans.user and (trans.user.requests or trans.app.security_agent.get_accessible_request_types(trans, trans.user))), 'email' : trans.user.email if (trans.user) else "", 'valid' : bool(trans.user != None), - 'json' : get_user_json() + 'json' : get_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.