diff --git a/.gitmodules b/.gitmodules index 8044a68a56..a4e47f19f9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,4 +9,8 @@ [submodule "content/16.x"] path = content/16.x url = https://github.com/gravitational/teleport + branch = branch/v16 +[submodule "content/17.x"] + path = content/17.x + url = https://github.com/gravitational/teleport branch = master diff --git a/config.json b/config.json index 4d12d9f75b..3c97a47a4a 100644 --- a/config.json +++ b/config.json @@ -66,11 +66,15 @@ }, { "name": "15.x", - "branch": "branch/v15", - "latest": true + "branch": "branch/v15" }, { "name": "16.x", + "branch": "branch/v16", + "latest": true + }, + { + "name": "17.x", "branch": "master" } ] diff --git a/content/17.x b/content/17.x new file mode 160000 index 0000000000..a98b0430ad --- /dev/null +++ b/content/17.x @@ -0,0 +1 @@ +Subproject commit a98b0430add9e1cfdff68acf90960aef396d5822 diff --git a/pages/_app.tsx b/pages/_app.tsx index f862fd388a..8eca8ee51b 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -56,6 +56,7 @@ import "styles/varaibles.css"; import "styles/global.css"; import { GoogleAdsEvent } from "utils/tracking"; +const NEXT_PUBLIC_REDDIT_ID = process.env.NEXT_PUBLIC_REDDIT_ID; const NEXT_PUBLIC_GTM_ID = process.env.NEXT_PUBLIC_GTM_ID; const NEXT_PUBLIC_GTAG_ID = process.env.NEXT_PUBLIC_GTAG_ID; const NEXT_PUBLIC_GOOGLE_ADS_ID = process.env.NEXT_PUBLIC_GOOGLE_ADS_ID; @@ -204,6 +205,17 @@ const Analytics = () => { })(window, "qualified")`} + {/* DO NOT MODIFY UNLESS TO REPLACE A USER IDENTIFIER /*} + {/* End Reddit Pixel */} + + )} ); }; diff --git a/yarn.lock b/yarn.lock index cb7a056140..120db1739e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7710,11 +7710,11 @@ brace-expansion@^2.0.1: balanced-match "^1.0.0" braces@^3.0.2, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" @@ -10511,10 +10511,10 @@ filesize@^10.0.8: resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.1.0.tgz#846f5cd8d16e073c5d6767651a8264f6149183cd" integrity sha512-GTLKYyBSDz3nPhlLVPjPWZCnhkd9TrrRArNcy8Z+J2cqScB7h2McAzR6NBX6nYOoWafql0roY8hrocxnZBv9CQ== -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1"