From 9fc0464d377062d28975e74cd8cded9730f447ad Mon Sep 17 00:00:00 2001 From: Javier Villar Date: Tue, 5 Apr 2022 07:55:25 +0200 Subject: [PATCH 1/3] Updating github URLs to meet github security standards --- .gitmodules | 6 +++--- doc/manual/source/install.rst | 4 ++-- package-lock.json | 16 ++++++++-------- package.json | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitmodules b/.gitmodules index 65729fda11..f18825c0e7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "lib/assets/javascripts/cdb"] path = lib/assets/javascripts/cdb - url = git://github.com/CartoDB/carto.js.git + url = git@github.com:CartoDB/carto.js.git [submodule "app/assets/stylesheets/old_common"] path = app/assets/stylesheets/old_common - url = git://github.com/CartoDB/cartodb.css.git + url = git@github.com:CartoDB/cartodb.css.git [submodule "lib/sql"] path = lib/sql - url = git://github.com/CartoDB/cartodb-postgresql.git + url = git@github.com:CartoDB/cartodb-postgresql.git [submodule "private"] path = private url = git@github.com:CartoDB/cartodb-private.git diff --git a/doc/manual/source/install.rst b/doc/manual/source/install.rst index a99d478e2a..0dff811ee9 100644 --- a/doc/manual/source/install.rst +++ b/doc/manual/source/install.rst @@ -202,7 +202,7 @@ SQL API .. code-block:: bash - git clone git://github.com/CartoDB/CartoDB-SQL-API.git + git clone git@github.com:CartoDB/CartoDB-SQL-API.git cd CartoDB-SQL-API * Install npm dependencies @@ -232,7 +232,7 @@ MAPS API .. code-block:: bash - git clone git://github.com/CartoDB/Windshaft-cartodb.git + git clone git@github.com:CartoDB/Windshaft-cartodb.git cd Windshaft-cartodb * Install yarn dependencies diff --git a/package-lock.json b/package-lock.json index e6146a25b4..af61dd7f3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2674,7 +2674,7 @@ "d3-time-format": "2.1.0", "jquery": "2.1.4", "mustache": "1.1.0", - "perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#master", + "perfect-scrollbar": "github:CartoDB/perfect-scrollbar.git#master", "postcss": "5.0.19", "promise-polyfill": "^6.1.0", "torque.js": "github:CartoDB/torque#master", @@ -2697,8 +2697,8 @@ "integrity": "sha512-CyINJQ0SOUHojDdFDH4JEM0552vCR1utGyLHegJHyYH0JyCpSeTPxi4OBqHMA2jJZq4NH782LtaJWBImqI/HBw==" }, "perfect-scrollbar": { - "version": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", - "from": "git://github.com/CartoDB/perfect-scrollbar.git#master" + "version": "github:CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", + "from": "github:CartoDB/perfect-scrollbar.git#master" }, "torque.js": { "version": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", @@ -6363,8 +6363,8 @@ } }, "perfect-scrollbar": { - "version": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", - "from": "git://github.com/CartoDB/perfect-scrollbar.git#master" + "version": "github:CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", + "from": "github:CartoDB/perfect-scrollbar.git#master" }, "torque.js": { "version": "github:CartoDB/torque#11b73bbc9a55b7c67c1ab72759a58eb417b88555", @@ -22838,7 +22838,7 @@ "d3-time-format": "2.1.0", "jquery": "2.1.4", "mustache": "1.1.0", - "perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#master", + "perfect-scrollbar": "github:CartoDB/perfect-scrollbar.git#master", "postcss": "5.0.19", "promise-polyfill": "^6.1.0", "torque.js": "github:CartoDB/torque#master", @@ -30239,8 +30239,8 @@ "dev": true }, "perfect-scrollbar": { - "version": "git://github.com/CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", - "from": "git://github.com/CartoDB/perfect-scrollbar.git#master" + "version": "github:CartoDB/perfect-scrollbar.git#f2b66c76ad3718d3c704bd7e1693ea382e44e64d", + "from": "github:CartoDB/perfect-scrollbar.git#master" }, "performance-now": { "version": "2.1.0", diff --git a/package.json b/package.json index 9716de723c..97bffebf55 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "CARTO UI frontend", "repository": { "type": "git", - "url": "git://github.com/CartoDB/cartodb.git" + "url": "github:CartoDB/cartodb.git" }, "author": { "name": "CARTO", @@ -65,7 +65,7 @@ "moment": "2.18.1", "moment-timezone": "^0.5.13", "node-polyglot": "1.0.0", - "perfect-scrollbar": "git://github.com/CartoDB/perfect-scrollbar.git#master", + "perfect-scrollbar": "github:CartoDB/perfect-scrollbar.git#master", "postcss": "5.0.19", "postcss-scss": "0.4.0", "postcss-strip-inline-comments": "0.1.5", From 98537f9904f6e39a33523744657691016fb6e3e7 Mon Sep 17 00:00:00 2001 From: Javier Villar Date: Tue, 5 Apr 2022 14:25:26 +0200 Subject: [PATCH 2/3] Updating carto.js submodule to v3.15.17 --- lib/assets/javascripts/cdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/assets/javascripts/cdb b/lib/assets/javascripts/cdb index 05916e8a62..5203f3352f 160000 --- a/lib/assets/javascripts/cdb +++ b/lib/assets/javascripts/cdb @@ -1 +1 @@ -Subproject commit 05916e8a628d7493ccf10cead69a7d85a589b00e +Subproject commit 5203f3352f0f0977c188aa9e9bdd03843f7b778b From 9de991b142165f4b2ea1167e3550692704921c08 Mon Sep 17 00:00:00 2001 From: Javier Villar Date: Tue, 5 Apr 2022 15:04:57 +0200 Subject: [PATCH 3/3] Using https for self main repository url --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 97bffebf55..0d760d833d 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "description": "CARTO UI frontend", "repository": { "type": "git", - "url": "github:CartoDB/cartodb.git" + "url": "https://github.com/CartoDB/cartodb.git" }, "author": { "name": "CARTO",