search

winnipegrb / winnivote

Winnivote is a website to submit topics/ideas and vote to show which ones are more popular
MIT License
10 stars 12 forks source link

Style edit form buttons using bootstrap #34

Closed jeffreyfultonca closed 10 years ago

jeffreyfultonca commented 10 years ago

Style buttons, add cancel button, refactor coffeescript accordingly, modify home_page.rb to click button instead of link, add bin/ directory to .gitignore

dbernar1 commented 10 years ago

A flaky test! How exciting! Sometimes is passes, sometimes it fails.

dbernar1 commented 10 years ago

Looks like the flaky test is unrelated to this piece of code.

amirci commented 10 years ago

Why do we need to add /bin to .gitignore ?

jeffreyfultonca commented 10 years ago

Perhaps we do not need to add /bin to .gitignore. I added it because it looked like all the other repos didn't have a /bin directory and I did. Thoughts?

dbernar1 commented 10 years ago

What's in your bin?

jeffreyfultonca commented 10 years ago

screen shot 2014-03-15 at 7 34 42 pm

dbernar1 commented 10 years ago

Weird - I wonder how you got that there. Do you remember running "bundle install --binstubs", or the term binstubs at all?

swalberg commented 10 years ago

Bin shouldn't be ignored. Binstubs go there and should be checked in.

Sean

On Saturday, March 15, 2014, Dan Bernardic notifications@github.com wrote:

What's in your bin?

Reply to this email directly or view it on GitHubhttps://github.com/winnipegrb/winnivote/pull/34#issuecomment-37743931 .

Sean Walberg sean@ertw.com http://ertw.com/

jeffreyfultonca commented 10 years ago

I removed /bin from .gitignore, amended the previous commit with 'commit --amend', then force pushed with 'push -f'. Is that workflow appropriate?

swalberg commented 10 years ago

Yes, the git work was correct. In the future please try and keep a pull request on a single topic though -- checking in the binstubs has nothing to do with your CSS/JS work and it should go in its own commit/PR (sorry, I didn't see that the first time around as I was checking on my phone)

amirci commented 10 years ago

Please, try to remove the bin folder and bundle again...

jeffreyfultonca commented 10 years ago

I believe the binstubs generation was caused by having "BUNDLE_BIN: bin" in my .bundle/config. I have removed this line and am no longer generating the bin/ folder when launching rails server.