Upgrade Colorbox

[ciddennis]

Upgrade to 1.5.13 Color box in order to fix simplecov-ruby/simplecov#270.

[scarver2]

All my manual tests confirm this fixed the issue in Safari. I also tested Chrome, Firefox, and Opera.

[bf4]

@ciddennis It looks like you have more than one commit of material in the one commit.

1. cleaning up the gitignore
2. updating the vendored jquery plugin
3. modifying application.js in ways I can't tell via the github ui.

Would you mind splitting your changes into multiple topical commits and force pushing to your master branch (this will automatically update the PR)

[ciddennis]

I will clean up the .gitignore. I use ruby mine and just had it add its config directory to the file which deleted the comments in the file. I will change it back to just have the .idea directory.

As for the application.js that was generated via the rake assets:compile in order to get the new version of the plugin merged in as I thought that was required, am I wrong in thinking this?

Thanks

[bf4]

@ciddennis Sounds like you did that right (I was just commenting as a consumer of the PR and didn't know why it was changed, as I didn't look at the code). Would be good to say that in the commit.

[ciddennis]

This is not really removed, Check out the raw file, just a bad diff output in GitHub.

[bf4]

git reset d543f0a4187d00c16c904f && git commit -a --amend -v && git push -f origin master

[gurix]

👍

[michaelherold]

@ciddennis Just so you know, you can ignore .idea in your ~/.gitignore file, so you don't have to add this to projects that you work on. I added that to my personal ~/.gitignore and it made my life much easier.

[bf4]

Closed by 1ba6e43