Skip to content

Commit 0a17891

Browse files
committed
Upgrade Rails to v7.0.5
1 parent a413a9f commit 0a17891

16 files changed

+305
-198
lines changed

Diff for: Gemfile

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ end
88

99

1010
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
11-
gem 'rails', '~> 6.1.7'
11+
gem 'rails', '~> 7.0.5'
1212
gem 'pg', '>= 0.20'
1313
# Use Puma as the app server
1414

@@ -45,7 +45,7 @@ gem 'bugsnag-capistrano', '< 2', require: false
4545
# https://github.com/nahi/httpclient/issues/369
4646
gem 'httpclient', github: '3scale/httpclient', branch: 'ssl-env-cert'
4747
gem 'oauth2'
48-
gem 'k8s-client', '>= 0.10'
48+
gem 'k8s-ruby'
4949

5050
gem 'lograge'
5151

@@ -67,7 +67,6 @@ group :development, :test do
6767

6868
gem 'license_finder', '~> 7.0.1'
6969

70-
# gem 'httplog'
7170
gem 'rubocop', require: false
7271
gem 'rubocop-performance', require: false
7372
gem 'rubocop-rails', require: false

Diff for: Gemfile.lock

+107-108
Original file line numberDiff line numberDiff line change
@@ -9,77 +9,83 @@ GEM
99
remote: https://rubygems.org/
1010
specs:
1111
3scale-api (1.4.0)
12-
actioncable (6.1.7.1)
13-
actionpack (= 6.1.7.1)
14-
activesupport (= 6.1.7.1)
12+
actioncable (7.0.5)
13+
actionpack (= 7.0.5)
14+
activesupport (= 7.0.5)
1515
nio4r (~> 2.0)
1616
websocket-driver (>= 0.6.1)
17-
actionmailbox (6.1.7.1)
18-
actionpack (= 6.1.7.1)
19-
activejob (= 6.1.7.1)
20-
activerecord (= 6.1.7.1)
21-
activestorage (= 6.1.7.1)
22-
activesupport (= 6.1.7.1)
17+
actionmailbox (7.0.5)
18+
actionpack (= 7.0.5)
19+
activejob (= 7.0.5)
20+
activerecord (= 7.0.5)
21+
activestorage (= 7.0.5)
22+
activesupport (= 7.0.5)
2323
mail (>= 2.7.1)
24-
actionmailer (6.1.7.1)
25-
actionpack (= 6.1.7.1)
26-
actionview (= 6.1.7.1)
27-
activejob (= 6.1.7.1)
28-
activesupport (= 6.1.7.1)
24+
net-imap
25+
net-pop
26+
net-smtp
27+
actionmailer (7.0.5)
28+
actionpack (= 7.0.5)
29+
actionview (= 7.0.5)
30+
activejob (= 7.0.5)
31+
activesupport (= 7.0.5)
2932
mail (~> 2.5, >= 2.5.4)
33+
net-imap
34+
net-pop
35+
net-smtp
3036
rails-dom-testing (~> 2.0)
31-
actionpack (6.1.7.1)
32-
actionview (= 6.1.7.1)
33-
activesupport (= 6.1.7.1)
34-
rack (~> 2.0, >= 2.0.9)
37+
actionpack (7.0.5)
38+
actionview (= 7.0.5)
39+
activesupport (= 7.0.5)
40+
rack (~> 2.0, >= 2.2.4)
3541
rack-test (>= 0.6.3)
3642
rails-dom-testing (~> 2.0)
3743
rails-html-sanitizer (~> 1.0, >= 1.2.0)
38-
actiontext (6.1.7.1)
39-
actionpack (= 6.1.7.1)
40-
activerecord (= 6.1.7.1)
41-
activestorage (= 6.1.7.1)
42-
activesupport (= 6.1.7.1)
44+
actiontext (7.0.5)
45+
actionpack (= 7.0.5)
46+
activerecord (= 7.0.5)
47+
activestorage (= 7.0.5)
48+
activesupport (= 7.0.5)
49+
globalid (>= 0.6.0)
4350
nokogiri (>= 1.8.5)
44-
actionview (6.1.7.1)
45-
activesupport (= 6.1.7.1)
51+
actionview (7.0.5)
52+
activesupport (= 7.0.5)
4653
builder (~> 3.1)
4754
erubi (~> 1.4)
4855
rails-dom-testing (~> 2.0)
4956
rails-html-sanitizer (~> 1.1, >= 1.2.0)
50-
activejob (6.1.7.1)
51-
activesupport (= 6.1.7.1)
57+
activejob (7.0.5)
58+
activesupport (= 7.0.5)
5259
globalid (>= 0.3.6)
53-
activemodel (6.1.7.1)
54-
activesupport (= 6.1.7.1)
55-
activerecord (6.1.7.1)
56-
activemodel (= 6.1.7.1)
57-
activesupport (= 6.1.7.1)
58-
activerecord-pg_enum (1.2.2)
60+
activemodel (7.0.5)
61+
activesupport (= 7.0.5)
62+
activerecord (7.0.5)
63+
activemodel (= 7.0.5)
64+
activesupport (= 7.0.5)
65+
activerecord-pg_enum (2.0.0)
5966
activerecord (>= 4.1.0)
6067
activesupport
6168
pg
62-
activestorage (6.1.7.1)
63-
actionpack (= 6.1.7.1)
64-
activejob (= 6.1.7.1)
65-
activerecord (= 6.1.7.1)
66-
activesupport (= 6.1.7.1)
69+
activestorage (7.0.5)
70+
actionpack (= 7.0.5)
71+
activejob (= 7.0.5)
72+
activerecord (= 7.0.5)
73+
activesupport (= 7.0.5)
6774
marcel (~> 1.0)
6875
mini_mime (>= 1.1.0)
69-
activesupport (6.1.7.1)
76+
activesupport (7.0.5)
7077
concurrent-ruby (~> 1.0, >= 1.0.2)
7178
i18n (>= 1.6, < 2)
7279
minitest (>= 5.1)
7380
tzinfo (~> 2.0)
74-
zeitwerk (~> 2.3)
7581
addressable (2.8.0)
7682
public_suffix (>= 2.0.2, < 5.0)
7783
ansi (1.5.0)
7884
ast (2.4.2)
79-
binding_of_caller (0.8.0)
85+
binding_of_caller (1.0.0)
8086
debug_inspector (>= 0.0.1)
81-
bootsnap (1.7.2)
82-
msgpack (~> 1.0)
87+
bootsnap (1.16.0)
88+
msgpack (~> 1.2)
8389
bugsnag (6.19.0)
8490
concurrent-ruby (~> 1.0)
8591
bugsnag-capistrano (1.1.2)
@@ -93,43 +99,42 @@ GEM
9399
rexml
94100
crass (1.0.6)
95101
date (3.3.3)
96-
debug_inspector (0.0.3)
102+
debug_inspector (1.1.0)
97103
docile (1.3.5)
98-
dry-configurable (0.9.0)
104+
dry-configurable (0.13.0)
99105
concurrent-ruby (~> 1.0)
100-
dry-core (~> 0.4, >= 0.4.7)
101-
dry-container (0.7.2)
106+
dry-core (~> 0.6)
107+
dry-container (0.11.0)
102108
concurrent-ruby (~> 1.0)
103-
dry-configurable (~> 0.1, >= 0.1.3)
104-
dry-core (0.4.9)
109+
dry-core (0.9.1)
105110
concurrent-ruby (~> 1.0)
106-
dry-equalizer (0.3.0)
107-
dry-inflector (0.2.0)
111+
zeitwerk (~> 2.6)
112+
dry-inflector (0.3.0)
108113
dry-initializer (3.0.4)
109-
dry-logic (0.6.1)
114+
dry-logic (1.3.0)
110115
concurrent-ruby (~> 1.0)
111-
dry-core (~> 0.2)
112-
dry-equalizer (~> 0.2)
113-
dry-struct (0.5.1)
114-
dry-core (~> 0.4, >= 0.4.3)
115-
dry-equalizer (~> 0.2)
116-
dry-types (~> 0.13)
116+
dry-core (~> 0.9, >= 0.9)
117+
zeitwerk (~> 2.6)
118+
dry-struct (1.5.2)
119+
dry-core (~> 0.9, >= 0.9)
120+
dry-types (~> 1.6)
117121
ice_nine (~> 0.11)
118-
dry-types (0.13.4)
122+
zeitwerk (~> 2.6)
123+
dry-types (1.6.1)
119124
concurrent-ruby (~> 1.0)
120125
dry-container (~> 0.3)
121-
dry-core (~> 0.4, >= 0.4.4)
122-
dry-equalizer (~> 0.2)
126+
dry-core (~> 0.9, >= 0.9)
123127
dry-inflector (~> 0.1, >= 0.1.2)
124-
dry-logic (~> 0.4, >= 0.4.2)
128+
dry-logic (~> 1.3, >= 1.3)
129+
zeitwerk (~> 2.6)
125130
erubi (1.12.0)
126-
excon (0.71.1)
131+
excon (0.100.0)
127132
faraday (1.3.0)
128133
faraday-net_http (~> 1.0)
129134
multipart-post (>= 1.2, < 3)
130135
ruby2_keywords
131136
faraday-net_http (1.0.1)
132-
globalid (1.0.1)
137+
globalid (1.1.0)
133138
activesupport (>= 5.0)
134139
hashdiff (1.0.1)
135140
i18n (1.12.0)
@@ -141,31 +146,32 @@ GEM
141146
multi_json
142147
to_regexp (~> 0.2.1)
143148
jwt (2.2.2)
144-
k8s-client (0.10.4)
145-
dry-struct (~> 0.5.0)
146-
dry-types (~> 0.13.0)
147-
excon (~> 0.66)
149+
k8s-ruby (0.14.0)
150+
dry-configurable (~> 0.13.0)
151+
dry-struct (<= 1.6.0)
152+
dry-types (<= 1.7.0)
153+
excon (~> 0.71)
148154
hashdiff (~> 1.0.0)
149155
jsonpath (~> 0.9.5)
150-
recursive-open-struct (~> 1.1.0)
156+
recursive-open-struct (~> 1.1.3)
151157
yajl-ruby (~> 1.4.0)
152-
yaml-safe_load_stream (~> 0.1)
158+
yaml-safe_load_stream3
153159
license_finder (7.0.1)
154160
bundler
155161
rubyzip (>= 1, < 3)
156162
thor (~> 1.2)
157163
tomlrb (>= 1.3, < 2.1)
158164
with_env (= 1.1.0)
159165
xml-simple (~> 1.1.9)
160-
lograge (0.11.2)
166+
lograge (0.12.0)
161167
actionpack (>= 4)
162168
activesupport (>= 4)
163169
railties (>= 4)
164170
request_store (~> 1.0)
165171
loofah (2.19.1)
166172
crass (~> 1.0.2)
167173
nokogiri (>= 1.5.9)
168-
mail (2.8.0.1)
174+
mail (2.8.1)
169175
mini_mime (>= 0.1.1)
170176
net-imap
171177
net-pop
@@ -183,13 +189,13 @@ GEM
183189
minitest (>= 5.0)
184190
ruby-progressbar
185191
minitest-stub-const (0.6)
186-
msgpack (1.4.2)
192+
msgpack (1.7.1)
187193
multi_json (1.15.0)
188194
multi_xml (0.6.0)
189195
multipart-post (2.1.1)
190196
mustermann (2.0.2)
191197
ruby2_keywords (~> 0.0.1)
192-
net-imap (0.3.4)
198+
net-imap (0.3.6)
193199
date
194200
net-protocol
195201
net-pop (0.1.2)
@@ -225,9 +231,9 @@ GEM
225231
pry-rescue (1.5.0)
226232
interception (>= 0.5)
227233
pry (>= 0.12.0)
228-
pry-stack_explorer (0.4.9.3)
229-
binding_of_caller (>= 0.7)
230-
pry (>= 0.9.11)
234+
pry-stack_explorer (0.6.1)
235+
binding_of_caller (~> 1.0)
236+
pry (~> 0.13)
231237
public_suffix (4.0.6)
232238
puma (5.2.1)
233239
nio4r (~> 2.0)
@@ -241,35 +247,35 @@ GEM
241247
rack
242248
rack-test (2.0.2)
243249
rack (>= 1.3)
244-
rails (6.1.7.1)
245-
actioncable (= 6.1.7.1)
246-
actionmailbox (= 6.1.7.1)
247-
actionmailer (= 6.1.7.1)
248-
actionpack (= 6.1.7.1)
249-
actiontext (= 6.1.7.1)
250-
actionview (= 6.1.7.1)
251-
activejob (= 6.1.7.1)
252-
activemodel (= 6.1.7.1)
253-
activerecord (= 6.1.7.1)
254-
activestorage (= 6.1.7.1)
255-
activesupport (= 6.1.7.1)
250+
rails (7.0.5)
251+
actioncable (= 7.0.5)
252+
actionmailbox (= 7.0.5)
253+
actionmailer (= 7.0.5)
254+
actionpack (= 7.0.5)
255+
actiontext (= 7.0.5)
256+
actionview (= 7.0.5)
257+
activejob (= 7.0.5)
258+
activemodel (= 7.0.5)
259+
activerecord (= 7.0.5)
260+
activestorage (= 7.0.5)
261+
activesupport (= 7.0.5)
256262
bundler (>= 1.15.0)
257-
railties (= 6.1.7.1)
258-
sprockets-rails (>= 2.0.0)
263+
railties (= 7.0.5)
259264
rails-dom-testing (2.0.3)
260265
activesupport (>= 4.2.0)
261266
nokogiri (>= 1.6)
262267
rails-html-sanitizer (1.4.4)
263268
loofah (~> 2.19, >= 2.19.1)
264-
railties (6.1.7.1)
265-
actionpack (= 6.1.7.1)
266-
activesupport (= 6.1.7.1)
269+
railties (7.0.5)
270+
actionpack (= 7.0.5)
271+
activesupport (= 7.0.5)
267272
method_source
268273
rake (>= 12.2)
269274
thor (~> 1.0)
275+
zeitwerk (~> 2.5)
270276
rainbow (3.1.1)
271277
rake (13.0.6)
272-
recursive-open-struct (1.1.0)
278+
recursive-open-struct (1.1.3)
273279
regexp_parser (2.8.0)
274280
request_store (1.5.0)
275281
rack (>= 1.4)
@@ -310,22 +316,15 @@ GEM
310316
rack (~> 2.2)
311317
rack-protection (= 2.2.3)
312318
tilt (~> 2.0)
313-
sprockets (4.2.0)
314-
concurrent-ruby (~> 1.0)
315-
rack (>= 2.2.4, < 4)
316-
sprockets-rails (3.4.2)
317-
actionpack (>= 5.2)
318-
activesupport (>= 5.2)
319-
sprockets (>= 3.0.0)
320319
thor (1.2.1)
321320
tilt (2.0.11)
322-
timeout (0.3.1)
321+
timeout (0.3.2)
323322
to_regexp (0.2.1)
324323
tomlrb (2.0.3)
325324
tzinfo (2.0.5)
326325
concurrent-ruby (~> 1.0)
327326
unicode-display_width (2.4.2)
328-
validate_url (1.0.13)
327+
validate_url (1.0.15)
329328
activemodel (>= 3.0.0)
330329
public_suffix
331330
webmock (3.11.2)
@@ -352,8 +351,8 @@ GEM
352351
yabeda-rails (0.7.1)
353352
rails
354353
yabeda (~> 0.8)
355-
yajl-ruby (1.4.2)
356-
yaml-safe_load_stream (0.1.1)
354+
yajl-ruby (1.4.3)
355+
yaml-safe_load_stream3 (0.1.2)
357356
zeitwerk (2.6.6)
358357

359358
PLATFORMS
@@ -367,7 +366,7 @@ DEPENDENCIES
367366
bugsnag-capistrano (< 2)
368367
codecov
369368
httpclient!
370-
k8s-client (>= 0.10)
369+
k8s-ruby
371370
license_finder (~> 7.0.1)
372371
lograge
373372
message_bus
@@ -383,7 +382,7 @@ DEPENDENCIES
383382
puma (~> 5.2)
384383
que (~> 1.1.0)
385384
que-web
386-
rails (~> 6.1.7)
385+
rails (~> 7.0.5)
387386
responders (~> 3.0.1)
388387
rubocop
389388
rubocop-performance

0 commit comments

Comments
 (0)