Merge branch 'master' into onepointthree

Author: SomeKittens

Gruntfile.js

@@ -310,10 +310,10 @@ module.exports = function(grunt) {
     coverage: {
       options: {
         thresholds: {
-          'statements': 51.37,
-          'branches': 33.88,
-          'functions': 45.55,
-          'lines': 52.14
+          statements: 52.71,
+          branches: 35.25,
+          functions: 47.01,
+          lines: 53.41
         },
         dir: 'coverage',
         root: 'test'

test/unit/directives/directiveEditRepoCommit.unit.js

@@ -211,7 +211,7 @@ describe('directiveEditRepoCommit'.bold.underline.blue, function() {
     var $el = ctx.element[0]
       .querySelector('.commit.load > time.commit-time');
     expect($el).to.be.ok;
-    expect($el.innerText).to.equal('2 months ago');
+    expect($el.innerText).to.equal('3 months ago');
   });
 
 });