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

Combined PR

Author: djdefi

api/javascript/gha-cleanup/package-lock.json

@@ -12,7 +12,7 @@
     "commander": "^4.1.0",
     "dotenv": "^8.2.0",
     "inquirer": "^7.0.4",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "octokit": "^1.0.0-hello-world",
     "pretty-bytes": "^5.3.0",

api/javascript/gha-cleanup/package.json

@@ -9,7 +9,7 @@ GEM
     mustermann (2.0.2)
       ruby2_keywords (~> 0.0.1)
     netrc (0.11.0)
-    rack (2.2.5)
+    rack (2.2.6.2)
     rack-protection (2.2.3)
       rack
     rest-client (1.8.0)

api/ruby/basics-of-authentication/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     octokit (3.0.0)
       sawyer (~> 0.5.3)
-    rack (2.2.5)
+    rack (2.2.6.2)
     rack-protection (2.2.3)
       rack
     ruby2_keywords (0.0.5)

api/ruby/building-a-ci-server/Gemfile.lock

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gem "jwt", "~> 2.1"
 gem "octokit", "~> 4.0"
-gem "sinatra", "~> 2.0"
+gem "sinatra", "~> 2.2"

api/ruby/building-your-first-github-app/Gemfile

@@ -7,30 +7,32 @@ GEM
       multipart-post (>= 1.2, < 3)
     jwt (2.1.0)
     multipart-post (2.0.0)
-    mustermann (1.0.2)
+    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)
     rack (2.2.6.2)
-    rack-protection (2.0.3)
+    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)
-    sinatra (2.0.3)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.3)
+    sinatra (2.2.3)
+      mustermann (~> 2.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.3)
       tilt (~> 2.0)
-    tilt (2.0.8)
+    tilt (2.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   jwt (~> 2.1)
   octokit (~> 4.0)
-  sinatra (~> 2.0)
+  sinatra (~> 2.2)
 
 BUNDLED WITH
    1.14.6

api/ruby/building-your-first-github-app/Gemfile.lock

@@ -3,4 +3,4 @@ source "https://rubygems.org"
 gem "json",        "~> 1.8"
 gem "octokit",     "~> 3.0"
 gem "shotgun"
-gem "sinatra",     "~> 1.3.5"
+gem "sinatra",     "~> 2.2.3"

api/ruby/delivering-deployments/Gemfile

@@ -6,21 +6,25 @@ GEM
       multipart-post (>= 1.2, < 3)
     json (1.8.3)
     multipart-post (2.0.0)
+    mustermann (2.0.2)
+      ruby2_keywords (~> 0.0.1)
     octokit (3.0.0)
       sawyer (~> 0.5.3)
-    rack (1.6.13)
-    rack-protection (1.5.2)
+    rack (2.2.6.2)
+    rack-protection (2.2.3)
       rack
+    ruby2_keywords (0.0.5)
     sawyer (0.5.4)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
     shotgun (0.9)
       rack (>= 1.0)
-    sinatra (1.3.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    tilt (1.4.1)
+    sinatra (2.2.3)
+      mustermann (~> 2.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.3)
+      tilt (~> 2.0)
+    tilt (2.1.0)
 
 PLATFORMS
   ruby
@@ -29,7 +33,7 @@ DEPENDENCIES
   json (~> 1.8)
   octokit (~> 3.0)
   shotgun
-  sinatra (~> 1.3.5)
+  sinatra (~> 2.2.3)
 
 BUNDLED WITH
    1.11.2

api/ruby/delivering-deployments/Gemfile.lock

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "json", "~>2.1.0"
+gem "json", "~>2.3.0"
 gem "octokit", "~>4.7.0"
 gem "sinatra", "~>1.4.8"
 gem "sinatra_auth_github", "~>1.2.0"

api/ruby/rendering-data-as-graphs/Gemfile

@@ -6,25 +6,47 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     concurrent-ruby (1.2.0)
-    faraday (0.13.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.1.0)
+    json (2.3.0)
     minitest (5.17.0)
-    multipart-post (2.0.0)
+    multipart-post (2.3.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    public_suffix (3.0.0)
+    public_suffix (5.0.1)
     rack (1.6.13)
     rack-protection (1.5.5)
       rack
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    ruby2_keywords (0.0.5)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
@@ -46,7 +68,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  json (~> 2.1.0)
+  json (~> 2.3.0)
   octokit (~> 4.7.0)
   sinatra (~> 1.4.8)
   sinatra_auth_github (~> 1.2.0)