Merge branch 'master' into patches

CHANGELOG.md

@@ -29,6 +29,7 @@
 - Add the option to write logs to STDOUT instead of STDERR. @eyalzek
 - Add limit parameter to tasks API. @alexpekurovsky
 - Add SQLAlchemy pool settings.
+- Support for category type y axis.
 
 ### Changed
 

client/app/visualizations/chart/index.js

@@ -77,7 +77,7 @@ function ChartEditor(ColorPalette, clientConfig) {
       }
 
       scope.xAxisScales = ['datetime', 'linear', 'logarithmic', 'category'];
-      scope.yAxisScales = ['linear', 'logarithmic', 'datetime'];
+      scope.yAxisScales = ['linear', 'logarithmic', 'datetime', 'category'];
 
       scope.chartTypeChanged = () => {
         keys(scope.options.seriesOptions).forEach((key) => {