search

celluloid / reel

UNMAINTAINED: See celluloid/celluloid#779 - Celluloid::IO-powered web server
https://celluloid.io
MIT License
596 stars 87 forks source link

Prevent nil for current_request; raise RequestError as needed. #117

Closed digitalextremist closed 10 years ago

tarcieri commented 10 years ago

Can you rebase so cf1784d is the only commit in the PR?

digitalextremist commented 10 years ago

Sorry to ask this, but I closed & reopened the PR because I was trying to do that and failed. I researched the exact command, but could you please spell it out for me real quick since my rftm functionality seems to be failing?

tarcieri commented 10 years ago

Try git rebase origin/master (if you have origin pointed at celluloid/reel), or otherwise git rebase your_remote_name_for_upstream_reel/master

Also it'd be good if you made feature branches on your side instead of asking me to pull from your master

digitalextremist commented 10 years ago

I have a feature branch but failed to select that, which I will do also and resubmit. Thanks for your time & patience.