Merge branch 'master' of github.com:elastic/kibana into implement/uiExportsInjectVars

CONTRIBUTING.md

@@ -55,7 +55,7 @@ Please make sure you have signed the [Contributor License Agreement](http://www.
   npm run elasticsearch
   ```
 
-- Start the development server.
+- Start the development server. _On Windows, you'll need you use Git Bash, Cygwin, or a similar shell that exposes the `sh` command._
 
   ```sh
   npm start

package.json

@@ -49,7 +49,7 @@
     "test:coverage": "grunt test:coverage",
     "build": "grunt build",
     "build:ospackages": "grunt build --os-packages",
-    "start": "./bin/kibana --dev",
+    "start": "sh ./bin/kibana --dev",
     "precommit": "grunt precommit",
     "karma": "karma start",
     "elasticsearch": "grunt esvm:dev:keepalive",

src/cli/serve/read_yaml_config.js

@@ -48,7 +48,14 @@ module.exports = function (path) {
       _.forOwn(val, function (subVal, subKey) {
         apply(config, subVal, key + '.' + subKey);
       });
-    } else {
+    }
+    else if (_.isArray(val)) {
+      config[key] = [];
+      val.forEach((subVal, i) => {
+        apply(config, subVal, key + '.' + i);
+      });
+    }
+    else {
       _.set(config, key, val);
     }
   }

src/ui/public/notify/__tests__/notifier.js

@@ -43,8 +43,8 @@ describe('Notifier', function () {
       expect(notify('error').title).to.equal('Error');
     });
 
-    it('sets lifetime to Infinity', function () {
-      expect(notify('error').lifetime).to.equal(Infinity);
+    it('sets lifetime to 5 minutes', function () {
+      expect(notify('error').lifetime).to.equal(300000);
     });
 
     it('allows reporting', function () {

src/ui/public/notify/notifier.js

@@ -229,7 +229,7 @@ Notifier.prototype.error = function (err, cb) {
     content: formatMsg(err, this.from),
     icon: 'warning',
     title: 'Error',
-    lifetime: Infinity,
+    lifetime: 300000,
     actions: ['report', 'accept'],
     stack: formatStack(err)
   }, cb);