From c223ebff6dff348acfe70d329657fc71fef605d1 Mon Sep 17 00:00:00 2001 From: Martin Cech Date: Wed, 27 Jul 2016 13:03:53 -0400 Subject: [PATCH] explicitly disable activation for TS because inherited user controller wants the property --- lib/galaxy/webapps/tool_shed/config.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/galaxy/webapps/tool_shed/config.py b/lib/galaxy/webapps/tool_shed/config.py index bd560ba0844..6ffef60aade 100644 --- a/lib/galaxy/webapps/tool_shed/config.py +++ b/lib/galaxy/webapps/tool_shed/config.py @@ -83,6 +83,7 @@ class Configuration( object ): # Galaxy flavor Docker Image self.enable_galaxy_flavor_docker_image = string_as_bool( kwargs.get( "enable_galaxy_flavor_docker_image", "False" ) ) self.use_remote_user = string_as_bool( kwargs.get( "use_remote_user", "False" ) ) + self.user_activation_on = None self.registration_warning_message = kwargs.get( 'registration_warning_message', None ) self.terms_url = kwargs.get( 'terms_url', None ) self.blacklist_location = kwargs.get( 'blacklist_file', None )