Merge branch 'grunt-conventional-changelog-support' of git://github.c…

…om/PascalPrecht/ui-router into PascalPrecht-grunt-conventional-changelog-support Conflicts: Gruntfile.js package.json
angular-ui · Dec 5, 2013 · cd6cd1d · cd6cd1d
2 parents dc75ea0 + d5fba25
commit cd6cd1d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -77,18 +77,23 @@ module.exports = function (grunt) {
  }
  }
  },
- karma: {
- options: {
- configFile: 'config/karma.js'
- },
- unit: {
- singleRun: true
+ karma: {
+ options: {
+ configFile: 'config/karma.js'
+ },
+ unit: {
+ singleRun: true
+ },
+ background: {
+ background: true,
+ browsers: [ grunt.option('browser') || 'PhantomJS' ]
+ }
  },
- background: {
- background: true,
- browsers: [ grunt.option('browser') || 'PhantomJS' ]
+ changelog: {
+ options: {
+ dest: 'CHANGELOG.md'
+ }
  }
- }
  });
 
  grunt.registerTask('default', ['build', 'jshint', 'karma:unit']);

diff --git a/package.json b/package.json
@@ -57,6 +57,7 @@
  "karma-coffee-preprocessor": "~0.1.0",
  "karma": "~0.10.1",
  "karma-phantomjs-launcher": "~0.1.0",
- "load-grunt-tasks": "~0.2.0"
+ "load-grunt-tasks": "~0.2.0",
+ "grunt-conventional-changelog": "~1.0.0"
  }
 }