Skip to content

Conversation

@serious-steve
Copy link
Contributor

Fixes #42

@vsoch
Copy link
Member

vsoch commented Dec 16, 2016

Thanks! Could you rebase with master to add recent changes (eg, the circle yml file) so that testing is triggered and we can preview your changes?

@serious-steve
Copy link
Contributor Author

I did what you suggested, and either I made an mistake or I don't understand what happened.
There are five commits instead of two, and the PR looks identical to me.
I ran git rebase upstream/master on my branch, and committed. Is that what you aked me for?

Sorry... new to gitlabs development practises ... :)

@vsoch
Copy link
Member

vsoch commented Dec 16, 2016

I think you did it correctly (maybe with a little extra, haha) and it's strange that the CI didn't trigger - it may be something about the initial push not having circle, or that circle is down. For now I think the changes look good so I'll merge without preview. Thanks for your help with this!

@vsoch vsoch merged commit 26d8506 into singularityware:master Dec 16, 2016
@serious-steve serious-steve deleted the FixSingularityHubLink branch December 17, 2016 07:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants