Skip to content

Commit 3beda8a

Browse files
authored
Merge pull request #666 from github/combine-prs-branch
Combined PR
2 parents 20b537a + 4a7958e commit 3beda8a

File tree

12 files changed

+30
-31
lines changed

12 files changed

+30
-31
lines changed

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

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GEM
99
mustermann (2.0.2)
1010
ruby2_keywords (~> 0.0.1)
1111
netrc (0.11.0)
12-
rack (2.2.6.2)
12+
rack (2.2.6.4)
1313
rack-protection (2.2.3)
1414
rack
1515
rest-client (1.8.0)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ GEM
1010
ruby2_keywords (~> 0.0.1)
1111
octokit (3.0.0)
1212
sawyer (~> 0.5.3)
13-
rack (2.2.6.2)
13+
rack (2.2.6.4)
1414
rack-protection (2.2.3)
1515
rack
1616
ruby2_keywords (0.0.5)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ GEM
3333
octokit (4.9.0)
3434
sawyer (~> 0.8.0, >= 0.5.3)
3535
public_suffix (5.0.1)
36-
rack (2.2.6.2)
36+
rack (2.2.6.4)
3737
rack-protection (2.2.3)
3838
rack
3939
ruby2_keywords (0.0.5)

api/ruby/delivering-deployments/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ GEM
1010
ruby2_keywords (~> 0.0.1)
1111
octokit (3.0.0)
1212
sawyer (~> 0.5.3)
13-
rack (2.2.6.2)
13+
rack (2.2.6.4)
1414
rack-protection (2.2.3)
1515
rack
1616
ruby2_keywords (0.0.5)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (7.0.4.2)
4+
activesupport (7.0.4.3)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
66
i18n (>= 1.6, < 2)
77
minitest (>= 5.1)
88
tzinfo (~> 2.0)
99
addressable (2.8.1)
1010
public_suffix (>= 2.0.2, < 6.0)
11-
concurrent-ruby (1.2.0)
11+
concurrent-ruby (1.2.2)
1212
faraday (1.10.3)
1313
faraday-em_http (~> 1.0)
1414
faraday-em_synchrony (~> 1.0)
@@ -35,7 +35,7 @@ GEM
3535
i18n (1.12.0)
3636
concurrent-ruby (~> 1.0)
3737
json (2.3.0)
38-
minitest (5.17.0)
38+
minitest (5.18.0)
3939
multipart-post (2.3.0)
4040
octokit (4.7.0)
4141
sawyer (~> 0.8.0, >= 0.5.3)

app/ruby/app-issue-creator/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source "https://rubygems.org"
22

3-
gem "activesupport", "~> 6.0"
3+
gem "activesupport", "~> 6.1"
44
gem "json", "~> 2.3"
55
gem "jwt"
66
gem "octokit"

app/ruby/app-issue-creator/Gemfile.lock

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (6.0.6.1)
4+
activesupport (6.1.7.3)
55
concurrent-ruby (~> 1.0, >= 1.0.2)
6-
i18n (>= 0.7, < 2)
7-
minitest (~> 5.1)
8-
tzinfo (~> 1.1)
9-
zeitwerk (~> 2.2, >= 2.2.2)
6+
i18n (>= 1.6, < 2)
7+
minitest (>= 5.1)
8+
tzinfo (~> 2.0)
9+
zeitwerk (~> 2.3)
1010
addressable (2.8.1)
1111
public_suffix (>= 2.0.2, < 6.0)
12-
concurrent-ruby (1.2.0)
12+
concurrent-ruby (1.2.2)
1313
faraday (1.10.3)
1414
faraday-em_http (~> 1.0)
1515
faraday-em_synchrony (~> 1.0)
@@ -37,14 +37,14 @@ GEM
3737
concurrent-ruby (~> 1.0)
3838
json (2.3.0)
3939
jwt (1.5.6)
40-
minitest (5.17.0)
40+
minitest (5.18.0)
4141
multipart-post (2.3.0)
4242
mustermann (2.0.2)
4343
ruby2_keywords (~> 0.0.1)
4444
octokit (4.7.0)
4545
sawyer (~> 0.8.0, >= 0.5.3)
4646
public_suffix (5.0.1)
47-
rack (2.2.6.2)
47+
rack (2.2.6.4)
4848
rack-protection (2.2.3)
4949
rack
5050
ruby2_keywords (0.0.5)
@@ -56,17 +56,16 @@ GEM
5656
rack (~> 2.2)
5757
rack-protection (= 2.2.3)
5858
tilt (~> 2.0)
59-
thread_safe (0.3.6)
6059
tilt (2.1.0)
61-
tzinfo (1.2.11)
62-
thread_safe (~> 0.1)
63-
zeitwerk (2.6.6)
60+
tzinfo (2.0.6)
61+
concurrent-ruby (~> 1.0)
62+
zeitwerk (2.6.7)
6463

6564
PLATFORMS
6665
ruby
6766

6867
DEPENDENCIES
69-
activesupport (~> 6.0)
68+
activesupport (~> 6.1)
7069
json (~> 2.3)
7170
jwt
7271
octokit
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
flask==1.0
1+
flask==2.3.2

hooks/ruby/configuring-your-server/Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ GEM
44
json (2.3.0)
55
mustermann (2.0.2)
66
ruby2_keywords (~> 0.0.1)
7-
rack (2.2.6.2)
7+
rack (2.2.6.4)
88
rack-protection (2.2.3)
99
rack
1010
ruby2_keywords (0.0.5)

0 commit comments

Comments
 (0)