Skip to content

Updating nokogiri to new version for security reasons.#41

Merged
richardhallett merged 4 commits intomasterfrom
update_nokogiri
Dec 29, 2017
Merged

Updating nokogiri to new version for security reasons.#41
richardhallett merged 4 commits intomasterfrom
update_nokogiri

Conversation

@richardhallett
Copy link
Copy Markdown
Contributor

@richardhallett richardhallett commented Dec 29, 2017

Also includes updates to travis to ensure building of PR's on different branches.

@richardhallett richardhallett self-assigned this Dec 29, 2017
@ghost ghost added the development label Dec 29, 2017
Copy link
Copy Markdown

@mfenner mfenner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest to be consistent with all static sites regarding branches and where and when to deploy, compare to https://github.com/datacite/homepage/blob/master/.travis.yml.

So either have all builds go to test as here, or dont build/deploy unless master branch. I guess I prefer the latter, because otherwise every pull request is deployed.

Maybe the exit 1; is the reason pull request builds failed before.

@richardhallett richardhallett merged commit 049fe86 into master Dec 29, 2017
@richardhallett richardhallett deleted the update_nokogiri branch December 29, 2017 13:20
@ghost ghost removed the development label Dec 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants