Merge branch 'master' into bug/ch95488/exception-trace-lost-and-logged-as-info

4 years ago · f7f2e2f4a1
parent c74a232ed9 66fff384ac
commit f7f2e2f4a1
4 changed files with 39 additions and 34 deletions
--- a/NEWS.md
+++ b/NEWS.md
@ -10,6 +10,7 @@ Development
 ### Bug fixes / enhancements

 - The `X-Request-ID` HTTP header is now propagated from incoming requests to outbound requests for better traceability [#15778](https://github.com/CartoDB/cartodb/pull/15778)
+- Fix Catalog "I'm interested" button ([#15785](https://github.com/CartoDB/cartodb/pull/15785))
 - Bumps cartodb-common to v0.3.3 to fix error traces ([#15787](https://github.com/CartoDB/cartodb/pull/15787))

 4.40.0 (2020-07-31)
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "cartodb-ui",
-  "version": "1.0.0-assets.189",
+  "version": "1.0.0-assets.190",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@ -1524,21 +1524,24 @@
        "backbone": "1.2.3",
        "backbone-poller": "^1.1.3",
        "camshaft-reference": "0.34.0",
+        "carto": "github:cartodb/carto#master",
        "clip-path-polygon": "0.1.12",
        "d3-array": "1.2.1",
        "d3-format": "1.2.0",
        "d3-time-format": "2.1.0",
        "jquery": "2.1.4",
        "mustache": "1.1.0",
+        "perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#master",
        "postcss": "5.0.19",
        "promise-polyfill": "^6.1.0",
+        "torque.js": "github:CartoDB/torque#master",
        "underscore": "1.8.3",
        "whatwg-fetch": "^2.0.3"
      },
      "dependencies": {
        "carto": {
          "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
-          "from": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
+          "from": "github:cartodb/carto#master",
          "requires": {
            "mapnik-reference": "~6.0.2",
            "optimist": "~0.6.0",
@ -1547,34 +1550,23 @@
        },
        "perfect-scrollbar": {
          "version": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d",
-          "from": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d"
+          "from": "git://github.com/CartoDB/perfect-scrollbar.git#master"
        },
        "torque.js": {
          "version": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555",
-          "from": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555",
+          "from": "github:CartoDB/torque#master",
          "requires": {
            "carto": "github:cartodb/carto#master",
            "d3": "3.5.17",
            "turbo-carto": "^0.21.1",
            "turf-jenks": "~1.0.1"
-          },
-          "dependencies": {
-            "carto": {
-              "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
-              "from": "github:cartodb/carto#master",
-              "requires": {
-                "mapnik-reference": "~6.0.2",
-                "optimist": "~0.6.0",
-                "underscore": "1.8.3"
-              }
-            }
          }
        }
      }
    },
    "@carto/common-ui": {
-      "version": "git://github.com/CartoDB/common-ui.git#a08de90caa6eec9fc98661846ea912bc459ed8f5",
-      "from": "git://github.com/CartoDB/common-ui.git#v0.1.3",
+      "version": "git://github.com/CartoDB/common-ui.git#f214e7ca54f3a660a9e3d7ee013e2ca14d82ad54",
+      "from": "git://github.com/CartoDB/common-ui.git#v0.1.4",
      "requires": {
        "core-js": "^3.6.4",
        "vue": "^2.6.11",
@ -1589,9 +1581,9 @@
          "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
        },
        "vue-router": {
-          "version": "3.3.4",
-          "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.3.4.tgz",
-          "integrity": "sha512-SdKRBeoXUjaZ9R/8AyxsdTqkOfMcI5tWxPZOUX5Ie1BTL5rPSZ0O++pbiZCeYeythiZIdLEfkDiQPKIaWk5hDg=="
+          "version": "3.4.2",
+          "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.2.tgz",
+          "integrity": "sha512-n3Ok70hW0EpcJF4lcWIwSHAQbFTnIOLl/fhO8+oTs4jHNtBNsovcVvPZeTOyKEd8C3xF1Crft2ASuOiVT5K1mw=="
        },
        "vuex": {
          "version": "3.5.1",
@ -1599,9 +1591,9 @@
          "integrity": "sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw=="
        },
        "whatwg-fetch": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.2.0.tgz",
-          "integrity": "sha512-SdGPoQMMnzVYThUbSrEvqTlkvC1Ux27NehaJ/GUHBfNrh5Mjg+1/uRyFMwVnxO2MrikMWvWAqUGgQOfVU4hT7w=="
+          "version": "3.3.1",
+          "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.3.1.tgz",
+          "integrity": "sha512-faXTmGDcLuEPBpJwb5LQfyxvubKiE+RlbmmweFGKjvIPFj4uHTTfdtTIkdTRhC6OSH9S9eyYbx8kZ0UEaQqYTA=="
        }
      }
    },
@ -3481,7 +3473,7 @@
    "are-we-there-yet": {
      "version": "1.1.5",
      "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
-      "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
+      "integrity": "sha1-SzXClE8GKov82mZBB2A1D+nd/CE=",
      "dev": true,
      "requires": {
        "delegates": "^1.0.0",
@ -7304,7 +7296,7 @@
    "deep-extend": {
      "version": "0.6.0",
      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "integrity": "sha1-xPp8lUBKF6nD6Mp+FTcxK3NjMKw=",
      "dev": true,
      "optional": true
    },
@ -15203,7 +15195,7 @@
    "node-gyp": {
      "version": "3.8.0",
      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz",
-      "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
+      "integrity": "sha1-VAMEJhwzDoDQ1e3OJTpoyzlkIYw=",
      "dev": true,
      "requires": {
        "fstream": "^1.0.0",
@ -15554,7 +15546,7 @@
    "npmlog": {
      "version": "4.1.2",
      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
-      "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
+      "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
      "dev": true,
      "requires": {
        "are-we-there-yet": "~1.1.2",
@ -17711,7 +17703,7 @@
    "rc": {
      "version": "1.2.8",
      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
+      "integrity": "sha1-zZJL9SAKB1uDwYjNa54hG3/A0+0=",
      "dev": true,
      "optional": true,
      "requires": {
@ -19486,7 +19478,7 @@
    "stdout-stream": {
      "version": "1.4.1",
      "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz",
-      "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
+      "integrity": "sha1-WsF0zdXNcmEEqgwLK9g4FdjVNd4=",
      "dev": true,
      "requires": {
        "readable-stream": "^2.0.1"
@ -21277,6 +21269,7 @@
      "version": "github:CartoDB/torque#23101417f2774217b42ac4088119ccb80798b088",
      "from": "github:CartoDB/torque#master",
      "requires": {
+        "carto": "github:cartodb/carto#master",
        "d3": "3.5.17",
        "turbo-carto": "^0.21.1",
        "turf-jenks": "~1.0.1"
@ -21284,7 +21277,7 @@
      "dependencies": {
        "carto": {
          "version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
-          "from": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
+          "from": "github:cartodb/carto#master",
          "requires": {
            "mapnik-reference": "~6.0.2",
            "optimist": "~0.6.0",
@ -21414,7 +21407,7 @@
    "true-case-path": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz",
-      "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
+      "integrity": "sha1-+BO1qMhrQNpZYGcisUTjIleZ9H0=",
      "dev": true,
      "requires": {
        "glob": "^7.1.2"
@ -23116,7 +23109,7 @@
    "wide-align": {
      "version": "1.1.3",
      "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
-      "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
+      "integrity": "sha1-rgdOa9wMFKQx6ATmJFScYzsABFc=",
      "dev": true,
      "requires": {
        "string-width": "^1.0.2 || 2"
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "cartodb-ui",
-  "version": "1.0.0-assets.189",
+  "version": "1.0.0-assets.190",
  "description": "CARTO UI frontend",
  "repository": {
    "type": "git",
@ -20,7 +20,7 @@
    "@babel/runtime": "^7.9.2",
    "@babel/runtime-corejs3": "^7.9.2",
    "@carto/carto.js": "^4.2.1",
-    "@carto/common-ui": "git://github.com/CartoDB/common-ui.git#v0.1.3",
+    "@carto/common-ui": "git://github.com/CartoDB/common-ui.git#v0.1.4",
    "@carto/toolkit-core": "0.0.1-rc.18",
    "@carto/toolkit-custom-storage": "0.0.1-rc.18",
    "@carto/zera": "1.0.7",
--- a/script/ci/runParallelTests.sh
+++ b/script/ci/runParallelTests.sh
@ -2,6 +2,17 @@

 WORKERS=${1:-22}

+syntax_errors=0
+# check syntax of modified Ruby files before running tests 
+for i in $(git diff --name-only origin/master -- "*.rb" ); 
+    do echo $i; ruby -c $i || ((syntax_errors=syntax_errors+1)); 
+done
+if [ $syntax_errors -gt 0 ]
+then
+    echo "Syntax Errors": $syntax_errors;
+    exit 1;
+fi
+
 # init builder
 script/ci/init.sh || exit 1