2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/64d677b1e16a/ Changeset: 64d677b1e16a Branch: next-stable User: dan Date: 2014-04-04 17:46:03 Summary: Provide a full URL including protocol in activation emails. Affected #: 1 file diff -r 583cf942ebc798e1038e00883a4af9b160ced30f -r 64d677b1e16ab79a60f91b315ecc8bee7505281c lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -804,7 +804,7 @@ Prepares the account activation link for the user. """ activation_token = self.get_activation_token( trans, email ) - activation_link = str( trans.request.host ) + url_for( controller='user', action='activate' ) + "?activation_token=" + str( activation_token ) + "&email=" + urllib.quote( email ) + activation_link = url_for( controller='user', action='activate', activation_token=activation_token, email=email, qualified=True ) return activation_link def get_activation_token ( self, trans, email ): https://bitbucket.org/galaxy/galaxy-central/commits/fd96caa42a43/ Changeset: fd96caa42a43 User: dan Date: 2014-04-04 17:46:24 Summary: merge next stable Affected #: 1 file diff -r 14dedba28a71a4826e8dc6bffe345756b449e143 -r fd96caa42a4397db660ddd5c24e8c94c7b1c9d3e lib/galaxy/webapps/galaxy/controllers/user.py --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -804,7 +804,7 @@ Prepares the account activation link for the user. """ activation_token = self.get_activation_token( trans, email ) - activation_link = str( trans.request.host ) + url_for( controller='user', action='activate' ) + "?activation_token=" + str( activation_token ) + "&email=" + urllib.quote( email ) + activation_link = url_for( controller='user', action='activate', activation_token=activation_token, email=email, qualified=True ) return activation_link def get_activation_token ( self, trans, email ): 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.