From 57f422a11923fd789ac6aff4d465cd27c057e930 Mon Sep 17 00:00:00 2001
From: Vladimir Abanin <vabanin@gmail.com>
Date: Thu, 5 Oct 2017 16:28:55 +0400
Subject: [PATCH] Merge branch 'master' of git://github.com/getredash/redash

# By Arik Fraimovich (8) and others
# Via GitHub (12) and others
* 'master' of git://github.com/getredash/redash: (21 commits)
  Modernize Python 2 code to get ready for Python 3
  Fixed eslint "Cannot read property 'length' of undefined" error
  Add option to set the flask-limiter storage engine
  Fix: don't crash query editor when there are unclosed curly brackets.
  Fix: error value in charts wasn't displayed if it was 0.
  Fix: tests entering endless loop, due to bad input.
  Cohort visualization: make it friendlier to use.
  Add missing import.
  Fix: Queries#all_queries was sometimes returning wrong number of queries.
  Fix #1950: record_event fails for api events
  Merged with upstream
  Bugfix: column.type not set by many data sources [sqlite, postgres etc]
  Use a different markdown library
  Update npm-shrinkwrap
  Use event.preventDefault() on EditInPlace textarea
  Remove magic numbers from EditInPlace()
  Update redirected link in README
  UnicodeWriter errors code to environment
  Hovertext length (#3)
  Merge/query based parameter (#2)
  ...

Conflicts:
	package.json
---
 client/app/visualizations/pivot/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/visualizations/pivot/index.js b/client/app/visualizations/pivot/index.js
index 08d4d5ccea..f4f9475d21 100644
--- a/client/app/visualizations/pivot/index.js
+++ b/client/app/visualizations/pivot/index.js
@@ -51,7 +51,7 @@ function pivotTableRenderer() {
                 $.pivotUtilities.renderers,
                 $.pivotUtilities.c3_renderers,
                 $.pivotUtilities.d3_renderers,
-                $.pivotUtilities.export_renderers
+                $.pivotUtilities.export_renderers,
               ),
               onRefresh(config) {
                 const configCopy = Object.assign({}, config);