search

gma / nesta

File Based CMS and Static Site Generator
http://nestacms.com
MIT License
902 stars 121 forks source link

Google Analytics tracking code update #149

Closed bbbenji closed 2 years ago

bbbenji commented 10 years ago

Google has updated their tracking code for Universal Analytics. This pull request updates the old code in Nesta with the new one.

gma commented 10 years ago

Thanks for this. Unfortunately it broke the build, as a test also needs updating. Could you fixup the commit (i.e. so the code and test are in the same commit)?

Here's the test that failed: https://travis-ci.org/gma/nesta/jobs/35003552

Cheers…

bbbenji commented 10 years ago

Sorry, don't know what you mean. I created a Pull Request from a different branch but it didn't pass.

gma commented 10 years ago

I just mean that I'd like to modify your existing commit, so that it contains both the new GA code and an update to the test that's failing.

You can do that with the --amend option to git commit. See http://git-scm.com/book/en/Git-Basics-Undoing-Things

bbbenji commented 10 years ago

Sorry for the mess I'm making. I'm trying to learn.

Looks like it passed on Ruby 2.1.1

gma commented 10 years ago

No problem - it’s not really mess, it’s just issues that we can close when you’re done.

Well worth taking the time to learn it. Have a look into topic branches too, if you’re interested in learning a bit more. They’re the ideal way to submit pull requests without adding commits (that might need to be deleted during PR review) to your own master branch.

http://git-scm.com/book/en/Git-Branching-Branching-Workflows#Topic-Branches

Pull requests made from a topic branch “track” that branch, so you can force-push a topic branch to GitHub after you’ve filed a PR, in order to update the code on that PR. Feel free to close #149 and make a pull request if you want to try that out...

On 11 Sep 2014, at 17:02, Benji notifications@github.com wrote:

Sorry for the mess I'm making. I'm trying to learn here. I'll get it.

— Reply to this email directly or view it on GitHub.

jkowens commented 9 years ago

@bbbenji Look into doing an interactive rebase to squash your commits down to one. The build should pass now if you update this PR.

http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages