Merge branch 'master' into dbdirect

.dockerignore

@@ -0,0 +1 @@
+node_modules/

Gemfile

@@ -56,7 +56,7 @@ end
 # Importer & sync tables
 gem 'roo',                     '1.13.2'
 gem 'state_machines-activerecord', '~> 0.5.0'
-gem 'typhoeus',                '0.7.2'
+gem 'typhoeus',                '1.3.1'
 gem 'charlock_holmes',         '0.7.6'
 gem 'dbf',                     '2.0.6'
 gem 'google-api-client',       '0.34.1'

Gemfile.lock

@@ -147,7 +147,7 @@ GEM
       simpleidn
     equalizer (0.0.11)
     erubis (2.7.0)
-    ethon (0.8.1)
+    ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.0.4)
     execjs (0.4.0)
@@ -438,8 +438,8 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.6)
     trollop (2.1.2)
-    typhoeus (0.7.2)
+    typhoeus (1.3.1)
-      ethon (>= 0.7.4)
+      ethon (>= 0.9.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
@@ -552,7 +552,7 @@ DEPENDENCIES
   statsd-client (= 0.0.7)
   test-unit
   thin
-  typhoeus (= 0.7.2)
+  typhoeus (= 1.3.1)
   unicorn (= 4.8.2)
   unicorn-worker-killer
   uuidtools (= 2.1.5)

NEWS.md

@@ -32,7 +32,8 @@ Development
 - Validate email only on change ([#15575](https://github.com/CartoDB/cartodb/pull/15575))
 - Fix viewer user creation from UI ([#15580](https://github.com/CartoDB/cartodb/pull/15580))
 - Set node 10.15.1 as default and only for building assets, removing 6.9.2 ([#15530](https://github.com/CartoDB/cartodb/issues/15530))
-- Update toolkit libraries to fix case sensitive field iss ([#15569](https://github.com/CartoDB/cartodb/pull/15569))
+- Update toolkit libraries to fix case sensitive fields ([#15569](https://github.com/CartoDB/cartodb/pull/15569))
+- Fix to avoid locks when sorting rows in dataset table ([#2399](https://github.com/CartoDB/support/issues/2399))
 
 4.36.0 (2020-03-09)
 -------------------

db/migrate/20200414085424_update_transportation.rb

@@ -0,0 +1,11 @@
+require 'carto/db/migration_helper'
+
+include Carto::Db::MigrationHelper
+
+migration(
+  Proc.new do
+    run "UPDATE users SET industry = 'Transportation and Logistics' WHERE industry = 'Transport and Logistics'"
+  end,
+  Proc.new do
+  end
+)

lib/assets/javascripts/builder/components/table/table-view.js

@@ -68,6 +68,8 @@ module.exports = CoreView.extend({
     this.listenTo(this._querySchemaModel, 'change:query change:status', _.debounce(this._onChangeQueryOrStatus, 100));
     this.listenTo(this._querySchemaModel, 'change:status', this._setDisableState);
     this.listenTo(this._querySchemaModel, 'change:query', this._onQueryChanged);
+
+    this._fetchRowsData = _.debounce(this._fetchRowsData, 100);
     this.listenTo(this._querySchemaModel, 'change:status', this._fetchRowsData);
     this.listenTo(this._tableViewModel, 'change:sort_order change:order_by', this._fetchRowsData);
 

lib/assets/javascripts/builder/data/query-rows-collection.js

@@ -200,6 +200,8 @@ module.exports = Backbone.Collection.extend({
   },
 
   fetch: function (opts) {
+    if (this.isFetching()) return;
+
     opts = opts || {};
 
     var previousStatus = this.getStatusValue();

lib/assets/javascripts/dashboard/views/profile/profile-form/profile-form-view.js

@@ -27,7 +27,7 @@ const INDUSTRIES = [
   'Consulting', 'CPG', 'Education and Research', 'Health and Medical', 'Insurance', 'Journalism and Media',
   'Manufacturing', 'Marketing and Advertising', 'Mining', 'Natural Resources and Environment', 'Non-Profit',
   'Real Estate', 'Retail', 'Software and Tech', 'Sports and Entertainment', 'Telecommunications',
-  'Transport and Logistics', 'Utilities', 'Other'
+  'Transportation and Logistics', 'Utilities', 'Other'
 ];
 
 const COMPANY_EMPLOYEES_RANGES = ['1-5', '5-25', '25-50', '50-100', '100-500', '500-1000', '1000+'];

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.173",
+  "version": "1.0.0-assets.174",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb-ui",
-  "version": "1.0.0-assets.173",
+  "version": "1.0.0-assets.174",
   "description": "CARTO UI frontend",
   "repository": {
     "type": "git",