search

NottingHack / hms

Hackspace Management System
4 stars 7 forks source link

Enhancement.#67 #89

Closed jamesfowkes closed 9 years ago

jamesfowkes commented 9 years ago

Think this is done now!

I accidentally pushed most of it to master anyway. I'm not even going to try fixing that because bad things will happen.

dpslwk commented 9 years ago

Never push to master!!! I’ll see about fixing it

‘RepRap’ Matt

On 18 May 2015, at 22:02, jamesfowkes notifications@github.com wrote:

Think this is done now!

I accidentally pushed most of it to master anyway. I'm not even going to try fixing that because bad things will happen.

You can view, comment on, or merge this pull request online at:

https://github.com/NottingHack/hms/pull/89 https://github.com/NottingHack/hms/pull/89 Commit Summary

Enhancement #67 changes Fixed unit tests for MembersController File Changes

M app/Controller/MembersController.php https://github.com/NottingHack/hms/pull/89/files#diff-0 (71) M app/Test/Case/Controller/MembersControllerTest.php https://github.com/NottingHack/hms/pull/89/files#diff-1 (398) M app/View/Members/list_members.ctp https://github.com/NottingHack/hms/pull/89/files#diff-2 (3) Patch Links:

https://github.com/NottingHack/hms/pull/89.patch https://github.com/NottingHack/hms/pull/89.patch https://github.com/NottingHack/hms/pull/89.diff https://github.com/NottingHack/hms/pull/89.diff — Reply to this email directly or view it on GitHub https://github.com/NottingHack/hms/pull/89.

jamesfowkes commented 9 years ago

Yeah, I'm just setting up a .git/hooks/pre-push script to stop me in my tracks if I try that again. http://dev.ghost.org/prevent-master-push/

geeksareforlife commented 9 years ago

Don't bother fixing it, it'll only end up messing up something.

Mistakes happen, we might as well remember them in the commit history!

On 18 May 2015 at 22:06, jamesfowkes notifications@github.com wrote:

Yeah, I'm just setting up a .pre-push script to stop me in my tracks if I try that again. http://dev.ghost.org/prevent-master-push/

— Reply to this email directly or view it on GitHub https://github.com/NottingHack/hms/pull/89#issuecomment-103211216.

dpslwk commented 9 years ago

to late its already done, only need a force push back to the correct commit

‘RepRap’ Matt

On 18 May 2015, at 22:11, James Hayward notifications@github.com wrote:

Don't bother fixing it, it'll only end up messing up something.

Mistakes happen, we might as well remember them in the commit history!

On 18 May 2015 at 22:06, jamesfowkes notifications@github.com wrote:

Yeah, I'm just setting up a .pre-push script to stop me in my tracks if I try that again. http://dev.ghost.org/prevent-master-push/

— Reply to this email directly or view it on GitHub https://github.com/NottingHack/hms/pull/89#issuecomment-103211216.

— Reply to this email directly or view it on GitHub https://github.com/NottingHack/hms/pull/89#issuecomment-103211994.

jamesfowkes commented 9 years ago

neveragain

james@jamespc:~/Documents/Code/hms$ git push Pushing to master is forbidden! error: failed to push some refs to 'git@github.com:nottinghack/hms.git'