Merge branch 'release' into feature/sqlbolt

Author: KeiranWDigital

Gemfile.lock

@@ -203,23 +203,25 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.14.2)
     multipart-post (2.1.1)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.10-x64-mingw32)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    nokogiri (1.11.1-x64-mingw32)
+      racc (~> 1.4)
     octokit (4.18.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (3.1.1)
+    racc (1.5.2)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -251,7 +253,6 @@ GEM
     unf_ext (0.0.7.7)
     unf_ext (0.0.7.7-x64-mingw32)
     unicode-display_width (1.7.0)
-    wdm (0.1.1)
     zeitwerk (2.4.0)
 
 PLATFORMS
@@ -260,7 +261,6 @@ PLATFORMS
 
 DEPENDENCIES
   github-pages
-  wdm (>= 0.1.0)
 
 BUNDLED WITH
    2.1.4

_data/questions/discord.yaml

@@ -7,6 +7,4 @@ answer: "<p>
 
     Once you have joined the server, check your email before the event which will tell you which channel to join. Most
     of our events will start at the Main Stage channel.
-</p>
-"
-
+</p>"

_data/questions/how-to-mentor.yaml

@@ -11,5 +11,3 @@ answer: "            <p>
                 add you into the appropriate Slack channels, give you a folder of your own in our Google Drive, show
                 you how to set up events, and so on.
               </p>"
-
-              

_data/questions/teams.yaml

@@ -0,0 +1,8 @@
+name: "teams"
+question: "I want to work on a project with other people. Can you support us?"
+answer: "<p>
+    Definitely. We'll give your team a private channel on our Slack workspace,
+    a private channel/room on our Discord server, and set up a shared folder for
+    you in our Google Drive account. You also get all the help that other members
+    get, including mentoring and conversations with our more experienced developers.
+  </p>"