Skip to content

Commit

Permalink
Merge pull request #7 from JustinBeckwith/master
Browse files Browse the repository at this point in the history
fix jshint ignore rules, add run script
  • Loading branch information
jmdobry committed Oct 1, 2015
2 parents 1b4867b + 52a2d52 commit 53b9558
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
node_modules/
npm-debug.log
2 changes: 1 addition & 1 deletion .jshintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ appengine/kraken/public/components/**
appengine/sails/config/**
appengine/sails/tasks/**
appengine/sails/assets/**
node_modules
**/node_modules/**
13 changes: 5 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,10 @@ accept your pull requests.

1. Submit an issue describing your proposed change to the repo in question.
1. The repo owner will respond to your issue promptly.
1. If your proposed change is accepted, and you haven't already done so, sign a
Contributor License Agreement (see details above).
1. If your proposed change is accepted, and you haven't already done so, sign a Contributor License Agreement (see details above).
1. Fork the desired repo, develop and test your code changes.
1. Ensure that your code adheres to the existing style in the sample to which
you are contributing. Refer to the
[Google Cloud Platform Samples Style Guide]
(https://github.com/GoogleCloudPlatform/Template/wiki/style.html) for the
recommended coding standards for this organization.
1. Ensure that your code adheres to the existing style in the sample to which you are contributing. Refer to the
[Google Cloud Platform Samples Style Guide](https://github.com/GoogleCloudPlatform/Template/wiki/style.html) for the
recommended coding standards for this organization. You can run `npm run jshint` to match our JavaScript coding standards.
1. Ensure that your code has an appropriate set of unit tests which all pass.
1. Submit a pull request.
1. Submit a pull request!
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"description": "Samples used in the nodejs documentation on cloud.google.com",
"main": "index.js",
"scripts": {
"test": "mocha --recursive"
"test": "mocha --recursive",
"jshint": "jshint --exclude-path=.jshintignore ."
},
"author": "jerjou@google.com",
"license": "Apache 2",
Expand Down

0 comments on commit 53b9558

Please sign in to comment.