Merge branch 'master' into dependabot/bundler/nokogiri-1.11.4

Author: markzegarelli

.vale.ini

@@ -4,3 +4,4 @@ Vocab = Docs
 
 [*.md]
 BasedOnStyles = write-good, segment
+TokenIgnores = ({% .* %})

js/feedback/index.js

@@ -32,8 +32,9 @@ export default function() {
   const tooltips = tippy(buttons)
   const defaultSettings = {
     interactive: true,
-    placement: 'bottom',
-    boundary: 'viewport',
+    flip: true,
+    placement: 'bottom-end',
+    boundary: '.docs',
     trigger: 'manual',
     onMount: (tooltip) => {
       const sendButton = document.querySelector(SEND_SELECTOR)

package-lock.json

@@ -22,6 +22,8 @@ const slugify = (displayName) => {
   if (slug === 'roku-alpha') slug = 'roku'
   if (slug === 'shopify-by-littledata') slug = 'shopify-littledata'
   if (slug === 'talon-one') slug = 'talonone'
+  if (slug == 'google-adwords-remarketing-lists-customer-match') slug = 'adwords-remarketing-lists'
+  if (slug == 'canny-classic') slug = 'canny'
   return slug
 }
 

scripts/catalog.js

@@ -70,20 +70,30 @@ else
     echo " ✔ Yarn already installed"
 fi
 
-brew install ruby
+# May 2021 - replacing the brew instructions with an rvm command
+# rvm helps keep the system ruby separate from the jekyll one
+# we'll need to periodically update this with the latest version of ruby we use
+# brew install ruby
+
+curl -sSL https://get.rvm.io | bash -s stable
+rvm install 2.7
+rvm --default use 2.7
+
 
 which -s bundler
 if [[ $? != 0 ]] ; then
-  gem install -n /usr/local/bin bundler:2.1.2
-  gem install bundler:2.1.2 --user-install
+  gem install bundler:2.2.2
   echo " ✔ Bundler installed"
 else
     echo " ✔ Bundler already installed"
 fi
 
-echo " Updating your Gem installation. Please enter your password to sudo."
-sudo gem update --system -n /usr/local/bin
-echo "Gem version " $(gem --version) "installed"
+echo " Installing gems for the docs repo."
+bundle install
+
+#echo " Updating your Gem installation. Please enter your password to sudo."
+#sudo gem update --system -n /usr/local/bin
+#echo "Gem version " $(gem --version) "installed"
 
 # can't get this working because comparing version strings is complicated.
 # which -s gem

scripts/env.sh

@@ -6,20 +6,30 @@ log=$(env -i git log -1 --pretty=%B)
 # run a series of checks for common reasons that we shouldn't preview build.
 # if no checks match, exit with code 1 to run the build
 
+# Force a build
+if echo $log | grep -1 'netlify\-build'; then
+echo "Force build becuase Netlify is a benevolent overseer"
+exit 1
+
 # ignore for simple typo fixes
-if echo "$log" | grep -q 'typo'; then
+elif echo "$log" | grep -q 'typo'; then
+echo "Build ignored because 'typo' is in the commit message."
 exit
 # ignore link / url updates
 elif echo "$log" | grep -q 'link'; then
+echo "Build ignored because 'link' is in the commit message."
 exit
 # ignore when the ignore tag is explicitly added
 elif echo "$log" | grep -q 'netlify\-ignore'; then
+echo "Build ignored because it was requested."
 exit 
 # ignore dependabot updates
 elif echo "$log" | grep -q 'dependabot'; then
+echo "Ignoring dependabot update"
 exit
 # ignore when master is merged into a branch
-elif echo "$log" | grep -q 'Merge branch \SMaster\S'; then
+elif echo "$log" | grep -q 'Merge branch \Smaster\S'; then
+echo "Build ignored because it's only an update from the main branch."
 exit
 else
 exit 1

scripts/ignore.sh

@@ -1,5 +1,5 @@
 # AUTOGENERATED FROM PLATFORM API. DO NOT EDIT
-# destination categories last updated 2021-05-17 
+# destination categories last updated 2021-06-23 
 items:
 - display_name: Email Marketing
   slug: email-marketing