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

[16.10] Fix RStudio login #3414

Merged
merged 1 commit into from Jan 13, 2017

Conversation

Projects
None yet
6 participants
@erasche
Copy link
Member

commented Jan 12, 2017

Fix RStudio login
Thanks @shiltemann for reporting this
@martenson

This comment has been minimized.

Copy link
Member

commented Jan 12, 2017

@erasche you might be targeting the wrong branch

@erasche

This comment has been minimized.

Copy link
Member Author

commented Jan 12, 2017

Thanks @martenson

@erasche erasche changed the base branch from dev to release_16.10 Jan 12, 2017

@erasche

This comment has been minimized.

Copy link
Member Author

commented Jan 12, 2017

Fixed

@martenson martenson changed the title [release_16.10] Fix RStudio login [16.10] Fix RStudio login Jan 12, 2017

@bgruening

This comment has been minimized.

Copy link
Member

commented Jan 12, 2017

👍 go for it @erasche!

@jmchilton jmchilton merged commit c94ccb3 into galaxyproject:release_16.10 Jan 13, 2017

3 of 4 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
api test Build finished. 230 tests run, 0 skipped, 0 failed.
Details
framework test Build finished. 127 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 580 tests run, 0 skipped, 0 failed.
Details
@jmchilton

This comment has been minimized.

Copy link
Member

commented Jan 13, 2017

Thanks for the fixes @erasche!

@galaxybot

This comment has been minimized.

Copy link

commented Jan 13, 2017

This PR was merged without a milestone attached.

@martenson martenson added this to the 17.01 milestone Jan 13, 2017

@erasche

This comment has been minimized.

Copy link
Member Author

commented Jan 13, 2017

@dannon how does this get merged forward? Is there a script I can run, or set of commands? I don't want to cause any issues

@dannon

This comment has been minimized.

Copy link
Member

commented Jan 13, 2017

I usually, from an up-to-date local dev branch, just do something like:

% git fetch upstream
% git merge upstream/release_16.10
(handle any resolution)
% git commit
% git push upstream/dev

@erasche PS: I'm more than happy to handle this if you want, just let me know if I can help

@erasche

This comment has been minimized.

Copy link
Member Author

commented Jan 13, 2017

@dannon, ah, great! I just wanted to learn a bit more about how it worked, perhaps decrease bus-factor :) If you're offering though, that would be really appreciated, thank you!

@dannon

This comment has been minimized.

Copy link
Member

commented Jan 13, 2017

@erasche Sure, definitely a good idea to decrease the bus-factor. And, of course, handling it now.

@erasche erasche deleted the erasche:fix-rstudio-login branch Aug 21, 2017

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.