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

docs/tilemap.asciidoc

@@ -107,6 +107,18 @@ heatmap dots appear at full intensity.
 * *Show Tooltip*: Check this box to have a tooltip with the values for a given dot when the cursor is on that dot.
 
 *Desaturate map tiles*:: Desaturate the map's color in order to make the markers stand out more clearly.
+*WMS compliant map server*:: Check this box to enable the use of a third-party mapping service that complies with the Web
+Map Service (WMS) standard. Specify the following elements:
+
+* *WMS url*: The URL for the WMS map service.
+* *WMS layers*: A comma-separated list of the layers to use in this visualization. Each map server provides its own list of
+layers.
+* *WMS version*: The WMS version used by this map service.
+* *WMS format*: The image format used by this map service. The two most common formats are `image/png` and `image/jpeg`.
+* *WMS attribution*: An optional, user-defined string that identifies the map source. Maps display the attribution string 
+in the lower right corner.
+* *WMS styles*: A comma-separated list of the styles to use in this visualization. Each map server provides its own styling 
+options.
 
 After changing options, click the green *Apply changes* button to update your visualization, or the grey *Discard 
 changes* button to keep your visualization in its current state.

src/cli/cli.js

@@ -23,7 +23,7 @@ program
 .description('Get the help for a specific command')
 .action(function (cmdName) {
   var cmd = _.find(program.commands, { _name: cmdName });
-  if (!cmd) return this.error(`unknown command ${cmd}`);
+  if (!cmd) return this.error(`unknown command ${cmdName}`);
   cmd.help();
 });
 

tasks/build/index.js

@@ -13,6 +13,7 @@ module.exports = function (grunt) {
     '_build:packageJson',
     '_build:readme',
     '_build:installNpmDeps',
+    '_build:removePkgJsonDeps',
     'clean:testsFromModules',
     'clean:deepModuleBins',
     'clean:deepModules',

tasks/build/removePkgJsonDeps.js

@@ -0,0 +1,12 @@
+module.exports = function (grunt) {
+  grunt.registerTask('_build:removePkgJsonDeps', function () {
+    const pkg = grunt.file.readJSON('build/kibana/package.json');
+
+    delete pkg.dependencies;
+
+    grunt.file.write(
+      'build/kibana/package.json',
+      JSON.stringify(pkg, null, '  ')
+    );
+  });
+};

tasks/config/karma.js

@@ -14,7 +14,7 @@ module.exports = function (grunt) {
       browsers: ['<%= karmaBrowser %>'],
 
       // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-      reporters: ['progress', 'growl'],
+      reporters: process.env.CI ? ['dots'] : ['progress', 'growl'],
 
       // list of files / patterns to load in the browser
       files: [