Skip to content

Commit

Permalink
Merge fe7c3b6 into 008686e
Browse files Browse the repository at this point in the history
  • Loading branch information
robinjoseph08 committed Aug 28, 2017
2 parents 008686e + fe7c3b6 commit 55b3005
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
extends: "eslint-config-lob"
extends: "lob/es5"
}
3 changes: 3 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
test/
coverage/
.eslint*
.travis.yml
2 changes: 1 addition & 1 deletion lib/git.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ exports.getCommits = function (options) {
if (!commit) {
return false;
}
return options.exclude ? (options.exclude.indexOf(commit.type) === -1) : true;
return options.exclude ? options.exclude.indexOf(commit.type) === -1 : true;
});
};
2 changes: 1 addition & 1 deletion lib/writer.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var TYPES = {
*/
exports.markdown = function (version, commits, options) {
var content = [];
var date = new Date().toJSON().slice(0,10);
var date = new Date().toJSON().slice(0, 10);
var heading;

if (options.major) {
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"release:major": "./bin/generate -M && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version major && git push origin && git push origin --tags",
"release:minor": "./bin/generate -m && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version minor && git push origin && git push origin --tags",
"release:patch": "./bin/generate -p && git add CHANGELOG.md && git commit -m 'updated CHANGELOG.md' && npm version patch && git push origin && git push origin --tags",
"coveralls": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
"coveralls": "cat ./coverage/lcov.info | coveralls",
"lint": "eslint .",
"test": "NODE_ENV=test istanbul cover _mocha -- test --recursive --timeout 30000",
"test-no-cover": "NODE_ENV=test mocha test --recursive --timeout 30000"
Expand Down Expand Up @@ -47,7 +47,8 @@
"chai-as-promised": "^5.1.0",
"coveralls": "^2.11.6",
"eslint": "^1.10.3",
"eslint-config-lob": "1.0.x",
"eslint-config-lob": "^2.4.0",
"eslint-plugin-lob": "^1.1.0",
"istanbul": "^0.4.1",
"mocha": "^2.3.4",
"sinon": "^1.17.2"
Expand Down
1 change: 1 addition & 0 deletions test/package.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ describe('package', function () {
Expect(version).to.eql('1.2.3');
});
});

});

});
2 changes: 1 addition & 1 deletion test/writer.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ describe('writer', function () {

it('wraps the hash in a link if a repoUrl is provided', function () {
var category = 'testing';
var url = 'https://github.com/lob/generate-changelog'
var url = 'https://github.com/lob/generate-changelog';
var commits = [
{ type: 'feat', category: category, subject: 'did some testing', hash: '1234567890' }
];
Expand Down

0 comments on commit 55b3005

Please sign in to comment.