Skip to content

Commit

Permalink
Updating dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
mzabriskie committed Mar 6, 2016
1 parent 7462c49 commit 6d84717
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
3 changes: 1 addition & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,10 @@
"before": false,
"after": true
}],
"space-after-keywords": 2, // http://eslint.org/docs/rules/space-after-keywords
"keyword-spacing": 2, // http://eslint.org/docs/rules/keyword-spacing
"space-before-blocks": 2, // http://eslint.org/docs/rules/space-before-blocks
"space-before-function-paren": [2, "never"], // http://eslint.org/docs/rules/space-before-function-paren
"space-infix-ops": 2, // http://eslint.org/docs/rules/space-infix-ops
"space-return-throw-case": 2, // http://eslint.org/docs/rules/space-return-throw-case
"spaced-comment": [2, "always", {// http://eslint.org/docs/rules/spaced-comment
"markers": ["global", "eslint"]
}]
Expand Down
1 change: 1 addition & 0 deletions lib/adapters/http.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ var zlib = require('zlib');
var pkg = require('./../../package.json');
var Buffer = require('buffer').Buffer;

/*eslint consistent-return:0*/
module.exports = function httpAdapter(resolve, reject, config) {
var data = config.data;
var headers = config.headers;
Expand Down
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,38 +28,38 @@
},
"homepage": "https://github.com/mzabriskie/axios",
"devDependencies": {
"coveralls": "2.11.6",
"es6-promise": "3.0.2",
"coveralls": "2.11.8",
"es6-promise": "3.1.2",
"grunt": "0.4.5",
"grunt-banner": "0.6.0",
"grunt-cli": "0.1.13",
"grunt-contrib-clean": "0.7.0",
"grunt-contrib-clean": "1.0.0",
"grunt-contrib-nodeunit": "0.4.1",
"grunt-contrib-watch": "0.6.1",
"grunt-eslint": "17.3.1",
"grunt-eslint": "18.0.0",
"grunt-karma": "0.12.1",
"grunt-ts": "5.3.2",
"grunt-update-json": "0.2.2",
"grunt-webpack": "1.0.11",
"istanbul-instrumenter-loader": "^0.1.3",
"istanbul-instrumenter-loader": "^0.2.0",
"jasmine-core": "2.4.1",
"karma": "0.13.19",
"karma": "0.13.21",
"karma-chrome-launcher": "^0.2.2",
"karma-coverage": "0.5.3",
"karma-coverage": "0.5.4",
"karma-firefox-launcher": "^0.1.7",
"karma-jasmine": "0.3.6",
"karma-jasmine": "0.3.7",
"karma-jasmine-ajax": "0.1.13",
"karma-opera-launcher": "^0.3.0",
"karma-phantomjs-launcher": "0.2.3",
"karma-phantomjs-launcher": "1.0.0",
"karma-safari-launcher": "^0.1.1",
"karma-sauce-launcher": "^0.3.1",
"karma-sinon": "1.0.4",
"karma-sourcemap-loader": "0.3.7",
"karma-webpack": "1.7.0",
"load-grunt-tasks": "3.4.0",
"load-grunt-tasks": "3.4.1",
"minimist": "1.2.0",
"phantomjs": "1.9.19",
"webpack": "1.12.11",
"phantomjs": "2.1.3",
"webpack": "1.12.14",
"webpack-dev-server": "1.14.1"
},
"browser": {
Expand Down

0 comments on commit 6d84717

Please sign in to comment.