Merge branch 'master' of https://github.com/preset-io/incubator-superset

into lily/user-with-roles-and-permission # Conflicts: # superset-frontend/src/types/bootstrapTypes.ts
apache · May 3, 2022 · c1089d2 · c1089d2
2 parents e28a102 + e1f53f2
commit c1089d2
Show file tree

Hide file tree

Showing 53 changed files with 1,112 additions and 378 deletions.
diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
@@ -146,6 +146,10 @@ const config = {
           trackingID: 'G-133LHD3B3N',
           anonymizeIP: true,
         },
+        gtag: {
+          trackingID: 'G-133LHD3B3N',
+          anonymizeIP: true,
+        },
       }),
     ],
   ],

diff --git a/docs/package.json b/docs/package.json
@@ -21,6 +21,7 @@
     "@docsearch/react": "^3.0.0",
     "@docusaurus/core": "^2.0.0-beta.17",
     "@docusaurus/plugin-client-redirects": "^2.0.0-beta.17",
+    "@docusaurus/plugin-google-gtag": "^2.0.0-beta.18",
     "@docusaurus/preset-classic": "^2.0.0-beta.17",
     "@emotion/core": "^10.1.1",
     "@emotion/styled": "^10.0.27",