Merge pull request #523 from github/combine-prs-branch

djdefi · web-flow · commit a185f020114e · 2023-02-23T16:38:00.000-08:00
Combined PR
diff --git a/api/javascript/org-invite/package-lock.json b/api/javascript/org-invite/package-lock.json
diff --git a/api/ruby/building-your-first-github-app/Gemfile.lock b/api/ruby/building-your-first-github-app/Gemfile.lock
@@ -1,24 +1,45 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    faraday (0.15.2)
-      multipart-post (>= 1.2, < 3)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     jwt (2.1.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    public_suffix (3.0.2)
+    public_suffix (5.0.1)
     rack (2.2.6.2)
     rack-protection (2.2.3)
       rack
     ruby2_keywords (0.0.5)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     sinatra (2.2.3)
       mustermann (~> 2.0)
       rack (~> 2.2)
diff --git a/api/ruby/delivering-deployments/Gemfile b/api/ruby/delivering-deployments/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "json",        "~> 1.8"
+gem "json",        "~> 2.3"
 gem "octokit",     "~> 3.0"
 gem "shotgun"
 gem "sinatra",     "~> 2.2.3"
diff --git a/api/ruby/delivering-deployments/Gemfile.lock b/api/ruby/delivering-deployments/Gemfile.lock
@@ -4,7 +4,7 @@ GEM
     addressable (2.3.6)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    json (1.8.3)
+    json (2.3.0)
     multipart-post (2.0.0)
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
@@ -30,7 +30,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  json (~> 1.8)
+  json (~> 2.3)
   octokit (~> 3.0)
   shotgun
   sinatra (~> 2.2.3)
diff --git a/app/ruby/app-issue-creator/Gemfile.lock b/app/ruby/app-issue-creator/Gemfile.lock
@@ -7,29 +7,50 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     concurrent-ruby (1.2.0)
-    faraday (0.12.1)
-      multipart-post (>= 1.2, < 3)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.3.0)
     jwt (1.5.6)
     minitest (5.17.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    public_suffix (2.0.5)
+    public_suffix (5.0.1)
     rack (2.2.6.2)
     rack-protection (2.2.3)
       rack
     ruby2_keywords (0.0.5)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     sinatra (2.2.3)
       mustermann (~> 2.0)
       rack (~> 2.2)
diff --git a/hooks/python/configuring-your-server/requirements.txt b/hooks/python/configuring-your-server/requirements.txt
@@ -1 +1 @@
-flask==0.12.2
+flask==1.0
diff --git a/hooks/python/flask-github-webhooks/requirements.txt b/hooks/python/flask-github-webhooks/requirements.txt
@@ -1,4 +1,4 @@
 Flask
 ipaddress
 requests
-pyOpenSSL==16.2.0
+pyOpenSSL==17.5.0
