Skip to content

Commit

Permalink
Merge pull request #39 from groupon/dbushong/feature/master/upgrade
Browse files Browse the repository at this point in the history
apply latest generator & lint rules
  • Loading branch information
dbushong committed Nov 18, 2017
2 parents 8c4982d + edafdef commit ac8bf87
Show file tree
Hide file tree
Showing 13 changed files with 350 additions and 225 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,3 +1,4 @@
/package-lock.json
node_modules/
npm-debug.log
/tmp
Expand Down
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -2,10 +2,11 @@ language: node_js
node_js:
- '4'
- '6'
- '8'
deploy:
provider: script
script: ./node_modules/.bin/nlm release
skip_cleanup: true
'on':
branch: master
node: '6'
node: '8'
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Expand Up @@ -31,7 +31,7 @@ If you report a bug, please follow these guidelines:

For small documentation changes, you can use [Github's editing feature](https://help.github.com/articles/editing-files-in-another-user-s-repository/).
The only thing to keep in mind is to prefix the commit message with "docs: ".
The detault commit message generated by Github will lead to a failing CI build.
The default commit message generated by Github will lead to a failing CI build.

For larger updates to the documentation
it might be better to follow the [instructions for contributing code below](#contributing-code).
Expand Down
46 changes: 8 additions & 38 deletions lib/assertive.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/assertive.js.map

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions lib/diff-stub.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/diff-stub.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Expand Up @@ -36,14 +36,14 @@
"babel-cli": "^6.24.1",
"babel-preset-env": "^1.6.0",
"bluebird": "^3.3.4",
"eslint": "^3.0.0",
"eslint-config-groupon": "^4.0.0",
"eslint-config-groupon-node4": "^4.0.0",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-node": "^2.0.0",
"eslint": "^4.7.1",
"eslint-config-groupon": "^5.0.0",
"eslint-plugin-import": "^2.8.0",
"eslint-plugin-node": "^5.1.1",
"eslint-plugin-prettier": "^2.2.0",
"mocha": "^3.1.2",
"nlm": "^3.0.0",
"nodemon": "^1.0.0"
"prettier": "^1.6.1"
},
"author": {
"name": "Groupon",
Expand Down

0 comments on commit ac8bf87

Please sign in to comment.