Merge branch 'main' into extend-sunset

Gemfile.lock

@@ -59,10 +59,10 @@ GEM
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    active_attr (0.15.3)
-      actionpack (>= 3.0.2, < 7.0)
-      activemodel (>= 3.0.2, < 7.0)
-      activesupport (>= 3.0.2, < 7.0)
+    active_attr (0.15.4)
+      actionpack (>= 3.0.2, < 7.1)
+      activemodel (>= 3.0.2, < 7.1)
+      activesupport (>= 3.0.2, < 7.1)
     active_record_query_trace (1.6.2)
     activejob (5.2.8.1)
       activesupport (= 5.2.8.1)
@@ -268,7 +268,7 @@ GEM
       dry-types (~> 0.14.0)
     equalizer (0.0.11)
     error_page_assets (0.4)
-    erubi (1.11.0)
+    erubi (1.12.0)
     exception_notification (4.4.3)
       actionmailer (>= 4.0, < 7)
       activesupport (>= 4.0, < 7)
@@ -314,7 +314,7 @@ GEM
     formatador (0.2.5)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
-    globalid (1.0.0)
+    globalid (1.0.1)
       activesupport (>= 5.0)
     guard (2.15.0)
       formatador (>= 0.2.4)
@@ -337,8 +337,8 @@ GEM
     hashdiff (0.3.8)
     hashie (3.6.0)
     htmlentities (4.3.4)
-    httparty (0.16.4)
-      mime-types (~> 3.0)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
     i18n (1.12.0)
@@ -402,17 +402,17 @@ GEM
     marcel (1.0.2)
     maruku (0.7.3)
     method_source (0.8.2)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
+    mime-types-data (3.2022.0105)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.1)
     mini_racer (0.6.2)
       libv8-node (~> 16.10.0.0)
-    minitest (5.16.3)
+    minitest (5.17.0)
     msgpack (1.3.3)
     multi_json (1.15.0)
     multi_xml (0.6.0)
@@ -521,8 +521,8 @@ GEM
     puma_worker_killer (0.3.1)
       get_process_mem (~> 0.2)
       puma (>= 2.7)
-    racc (1.6.1)
-    rack (2.2.4)
+    racc (1.6.2)
+    rack (2.2.6.2)
     rack-attack (5.4.2)
       rack (>= 1.0, < 3)
     rack-proxy (0.7.0)

config/environment.rb

@@ -36,9 +36,9 @@
 SITE_NAME = "OpenStax Tutor"
 COPYRIGHT_HOLDER = "Rice University"
 
-TUTOR_HELPDESK_URL = "https://openstax.secure.force.com/help"
-TUTOR_CONTACT_SUPPORT_URL = "#{TUTOR_HELPDESK_URL}/articles/FAQ/OpenStax-Tutor-Beta-customer-support-information"
-TUTOR_INTEGRATE_LMS_URL = "#{TUTOR_HELPDESK_URL}/articles/FAQ/LMS-integration-for-OpenStax-Tutor-Beta"
+TUTOR_HELPDESK_URL = "https://help.openstax.org"
+TUTOR_CONTACT_SUPPORT_URL = "#{TUTOR_HELPDESK_URL}/s/article/OpenStax-Tutor-Beta-customer-support-information"
+TUTOR_INTEGRATE_LMS_URL = "#{TUTOR_HELPDESK_URL}/s/article/LMS-integration-for-OpenStax-Tutor-Beta"
 
 # Initialize the Rails application.
 Rails.application.initialize!

yarn.lock

@@ -4015,9 +4015,9 @@ json3@^3.3.3:
   integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
 
 json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
@@ -4357,16 +4357,11 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.2.0:
+minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
   integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
 
-minimist@^1.2.5:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
-
 minipass-collect@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"