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

Combined PR
ardvansomeren · May 9, 2023 · 3beda8a · 3beda8a
2 parents 20b537a + 4a7958e
commit 3beda8a
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 31 deletions.
diff --git a/api/javascript/gha-cleanup/package-lock.json b/api/javascript/gha-cleanup/package-lock.json
diff --git a/api/ruby/basics-of-authentication/Gemfile.lock b/api/ruby/basics-of-authentication/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
-    rack (2.2.6.2)
+    rack (2.2.6.4)
     rack-protection (2.2.3)
       rack
     rest-client (1.8.0)

diff --git a/api/ruby/building-a-ci-server/Gemfile.lock b/api/ruby/building-a-ci-server/Gemfile.lock
@@ -10,7 +10,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     octokit (3.0.0)
       sawyer (~> 0.5.3)
-    rack (2.2.6.2)
+    rack (2.2.6.4)
     rack-protection (2.2.3)
       rack
     ruby2_keywords (0.0.5)

diff --git a/api/ruby/building-your-first-github-app/Gemfile.lock b/api/ruby/building-your-first-github-app/Gemfile.lock
@@ -33,7 +33,7 @@ GEM
     octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     public_suffix (5.0.1)
-    rack (2.2.6.2)
+    rack (2.2.6.4)
     rack-protection (2.2.3)
       rack
     ruby2_keywords (0.0.5)

diff --git a/api/ruby/delivering-deployments/Gemfile.lock b/api/ruby/delivering-deployments/Gemfile.lock
@@ -10,7 +10,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     octokit (3.0.0)
       sawyer (~> 0.5.3)
-    rack (2.2.6.2)
+    rack (2.2.6.4)
     rack-protection (2.2.3)
       rack
     ruby2_keywords (0.0.5)

diff --git a/api/ruby/rendering-data-as-graphs/Gemfile.lock b/api/ruby/rendering-data-as-graphs/Gemfile.lock
@@ -1,14 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.2)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -35,7 +35,7 @@ GEM
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     json (2.3.0)
-    minitest (5.17.0)
+    minitest (5.18.0)
     multipart-post (2.3.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)

diff --git a/app/ruby/app-issue-creator/Gemfile b/app/ruby/app-issue-creator/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "activesupport", "~> 6.0"
+gem "activesupport", "~> 6.1"
 gem "json",        "~> 2.3"
 gem "jwt"
 gem "octokit"

diff --git a/app/ruby/app-issue-creator/Gemfile.lock b/app/ruby/app-issue-creator/Gemfile.lock
@@ -1,15 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.6.1)
+    activesupport (6.1.7.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -37,14 +37,14 @@ GEM
       concurrent-ruby (~> 1.0)
     json (2.3.0)
     jwt (1.5.6)
-    minitest (5.17.0)
+    minitest (5.18.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 (5.0.1)
-    rack (2.2.6.2)
+    rack (2.2.6.4)
     rack-protection (2.2.3)
       rack
     ruby2_keywords (0.0.5)
@@ -56,17 +56,16 @@ GEM
       rack (~> 2.2)
       rack-protection (= 2.2.3)
       tilt (~> 2.0)
-    thread_safe (0.3.6)
     tilt (2.1.0)
-    tzinfo (1.2.11)
-      thread_safe (~> 0.1)
-    zeitwerk (2.6.6)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.6.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (~> 6.0)
+  activesupport (~> 6.1)
   json (~> 2.3)
   jwt
   octokit

diff --git a/hooks/python/configuring-your-server/requirements.txt b/hooks/python/configuring-your-server/requirements.txt
@@ -1 +1 @@
-flask==1.0
+flask==2.3.2
diff --git a/hooks/ruby/configuring-your-server/Gemfile.lock b/hooks/ruby/configuring-your-server/Gemfile.lock
@@ -4,7 +4,7 @@ GEM
     json (2.3.0)
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
-    rack (2.2.6.2)
+    rack (2.2.6.4)
     rack-protection (2.2.3)
       rack
     ruby2_keywords (0.0.5)

diff --git a/hooks/ruby/delete-repository-event/Gemfile.lock b/hooks/ruby/delete-repository-event/Gemfile.lock
@@ -26,7 +26,7 @@ GEM
     octokit (4.6.2)
       sawyer (~> 0.8.0, >= 0.5.3)
     public_suffix (4.0.6)
-    rack (2.2.6.2)
+    rack (2.2.6.4)
     rack-protection (2.2.3)
       rack
     ruby2_keywords (0.0.4)

diff --git a/hooks/ruby/dismiss-review-server/Gemfile.lock b/hooks/ruby/dismiss-review-server/Gemfile.lock
@@ -12,7 +12,7 @@ GEM
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
-    rack (2.2.6.2)
+    rack (2.2.6.4)
     rack-protection (2.2.3)
       rack
     rest-client (2.0.1)