Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

activation config touch #2158

Merged
merged 2 commits into from Jul 27, 2016

Conversation

Projects
None yet
2 participants
@martenson
Copy link
Member

commented Apr 13, 2016

remove unused config
clarify sample;
provide default for inactive message

@martenson martenson added this to the 16.07 milestone Apr 13, 2016

@@ -83,9 +83,6 @@ def __init__( self, **kwargs ):
# 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 = kwargs.get( 'user_activation_on', None )
self.activation_grace_period = kwargs.get( 'activation_grace_period', None )
self.inactivity_box_content = kwargs.get( 'inactivity_box_content', None )

This comment has been minimized.

Copy link
@nsoranzo

nsoranzo Apr 14, 2016

Member

Is that because user activation is not implemented in the Tool Shed?

This comment has been minimized.

Copy link
@martenson

martenson Apr 14, 2016

Author Member

correct, however the inherited user controller expects that to exist, so that is why the tests are failing :/

@martenson martenson self-assigned this Jul 26, 2016

explicitly disable activation for TS
because inherited user controller wants the property

@martenson martenson added status/review and removed status/WIP labels Jul 27, 2016

@martenson

This comment has been minimized.

Copy link
Member Author

commented Jul 27, 2016

this is now ready for review

@nsoranzo nsoranzo merged commit e625eed into galaxyproject:dev Jul 27, 2016

4 checks passed

api test Build finished. 224 tests run, 0 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 111 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 582 tests run, 0 skipped, 0 failed.
Details
@nsoranzo

This comment has been minimized.

Copy link
Member

commented Jul 27, 2016

Thanks @martenson!

@martenson martenson deleted the martenson:improve-activation branch Jul 27, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.