Merge branch 'grunt-conventional-changelog' of https://github.com/PascalPrecht/ui-codemirror into PascalPrecht-grunt-conventional-changelog

douglasduteil · douglasduteil · commit a8cd896287d6 · 2013-12-05T22:28:47.000+01:00
Conflicts:
	gruntFile.js
	package.json
diff --git a/gruntFile.js b/gruntFile.js
@@ -119,6 +119,11 @@ module.exports = function (grunt) {
               return {src: [f], dest: '<%= dist %>/' + f, filter: 'isFile'};
           }))
       }
+    },
+    changelog: {
+      options: {
+        dest: 'CHANGELOG.md'
+      }
     }
   });
 
diff --git a/package.json b/package.json
@@ -15,7 +15,8 @@
     "grunt-contrib-watch": "~0.5.3",
     "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-connect": "~0.5.0",
-    "load-grunt-tasks": "~0.2.0"
+    "load-grunt-tasks": "~0.2.0",
+    "grunt-conventional-changelog": "~1.0.0"
   },
   "scripts": {},
   "repository": {

Original file line number	Diff line number	Diff line change
`@@ -119,6 +119,11 @@ module.exports = function (grunt) {`
`119`	`119`	`return {src: [f], dest: '<%= dist %>/' + f, filter: 'isFile'};`
`120`	`120`	`}))`
`121`	`121`	`}`
	`122`	`+ },`
	`123`	`+ changelog: {`
	`124`	`+ options: {`
	`125`	`+ dest: 'CHANGELOG.md'`
	`126`	`+ }`
`122`	`127`	`}`
`123`	`128`	`});`
`124`	`129`