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

Functionality to allow admins to switch on/off the line endings conversion on import #2819

Merged

Conversation

zipho
Copy link
Contributor

@zipho zipho commented Aug 19, 2016

Functionality to allow admins to switch off the line endings conversion on import.

This is a cleanup to PR #2803

@zipho zipho changed the title Functionality to allow admins to switch off the line endings conversion on import Functionality to allow admins to switch on/off the line endings conversion on import Aug 19, 2016
@galaxybot galaxybot added this to the 16.10 milestone Aug 19, 2016
@@ -12,6 +12,7 @@
import sys
import tempfile
import zipfile
import cProfile
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove these changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are now removed.

@@ -12,7 +12,6 @@
import sys
import tempfile
import zipfile
import cProfile
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But the other changes to this file seem to remain - the part that used the cProfile import.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the changes. The initial commit did'nt carry these.

@zipho
Copy link
Contributor Author

zipho commented Sep 27, 2016

Is there any reasons this has not been merged. I am happy to comply with any suggestions.

@nsoranzo
Copy link
Member

LGTM, but ping @martenson (the libraries guru).

@martenson
Copy link
Member

martenson commented Sep 27, 2016

works well, thanks @zipho for the contribution and @jmchilton with @nsoranzo for the review

@martenson martenson merged commit aa70a97 into galaxyproject:dev Sep 27, 2016
@zipho zipho deleted the upload_admin_line_endings branch September 27, 2016 21:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants