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

[18.01] fix broken admin 'create new user' when registration =='challenge' #5569

Merged
merged 1 commit into from Feb 20, 2018

Conversation

Projects
None yet
4 participants
@scholtalbers
Contributor

scholtalbers commented Feb 20, 2018

The Admin 'Create new user' page was unreachable when the registration is set to 'challenge' due to the authenticate returning more than two values.

@scholtalbers scholtalbers changed the base branch from dev to release_18.01 Feb 20, 2018

@galaxybot galaxybot added the triage label Feb 20, 2018

@nsoranzo nsoranzo changed the title from fix broken admin 'create new user' when registration =='challenge' to [18.01] fix broken admin 'create new user' when registration =='challenge' Feb 20, 2018

@nsoranzo nsoranzo added this to the 18.01 milestone Feb 20, 2018

@nsoranzo

This comment has been minimized.

Member

nsoranzo commented Feb 20, 2018

Wow, that's been broken since commit 660cfcb (2015).

@nsoranzo

This comment has been minimized.

Member

nsoranzo commented Feb 20, 2018

Not sure why Travis is using tox.ini from the dev branch.

@scholtalbers

This comment has been minimized.

Contributor

scholtalbers commented Feb 20, 2018

I first had the PR against dev - then changed that.

This got broken with my commits regarding the populate ldap user as now the provider.authenticate() return more items: a6435ea

skip that, this part seems it was indeed broken before...

@nsoranzo nsoranzo closed this Feb 20, 2018

@nsoranzo nsoranzo reopened this Feb 20, 2018

@nsoranzo

This comment has been minimized.

Member

nsoranzo commented Feb 20, 2018

I first had the PR against dev - then changed that.

That explains it! I've closed and reopened the PR, now tests seems to correctly run against release_18.01.

@dannon dannon merged commit 01776c6 into galaxyproject:release_18.01 Feb 20, 2018

6 checks passed

api test Build finished. 351 tests run, 4 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 171 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 79 tests run, 4 skipped, 0 failed.
Details
selenium test Build finished. 118 tests run, 3 skipped, 0 failed.
Details
toolshed test Build finished. 577 tests run, 0 skipped, 0 failed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment