Skip to content

Commit ecbe97a

Browse files
authored
upgrade rails to 6.1 version (#1631)
1 parent 85cad4f commit ecbe97a

File tree

2 files changed

+80
-73
lines changed

2 files changed

+80
-73
lines changed

Gemfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ end
1111
gem 'active_record_extended'
1212
gem 'httparty'
1313
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
14-
gem 'rails', '6.0.6.1'
14+
if next?
15+
gem 'rails', '6.1.7.10'
16+
else
17+
gem 'rails', '6.0.6.1'
18+
end
1519
# Use postgresql as the database for Active Record
1620
gem 'pg', '~> 1.3'
1721
# Use Puma as the app server

Gemfile.next.lock

Lines changed: 75 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,68 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.0.6.1)
5-
actionpack (= 6.0.6.1)
4+
actioncable (6.1.7.10)
5+
actionpack (= 6.1.7.10)
6+
activesupport (= 6.1.7.10)
67
nio4r (~> 2.0)
78
websocket-driver (>= 0.6.1)
8-
actionmailbox (6.0.6.1)
9-
actionpack (= 6.0.6.1)
10-
activejob (= 6.0.6.1)
11-
activerecord (= 6.0.6.1)
12-
activestorage (= 6.0.6.1)
13-
activesupport (= 6.0.6.1)
9+
actionmailbox (6.1.7.10)
10+
actionpack (= 6.1.7.10)
11+
activejob (= 6.1.7.10)
12+
activerecord (= 6.1.7.10)
13+
activestorage (= 6.1.7.10)
14+
activesupport (= 6.1.7.10)
1415
mail (>= 2.7.1)
15-
actionmailer (6.0.6.1)
16-
actionpack (= 6.0.6.1)
17-
actionview (= 6.0.6.1)
18-
activejob (= 6.0.6.1)
16+
actionmailer (6.1.7.10)
17+
actionpack (= 6.1.7.10)
18+
actionview (= 6.1.7.10)
19+
activejob (= 6.1.7.10)
20+
activesupport (= 6.1.7.10)
1921
mail (~> 2.5, >= 2.5.4)
2022
rails-dom-testing (~> 2.0)
21-
actionpack (6.0.6.1)
22-
actionview (= 6.0.6.1)
23-
activesupport (= 6.0.6.1)
24-
rack (~> 2.0, >= 2.0.8)
23+
actionpack (6.1.7.10)
24+
actionview (= 6.1.7.10)
25+
activesupport (= 6.1.7.10)
26+
rack (~> 2.0, >= 2.0.9)
2527
rack-test (>= 0.6.3)
2628
rails-dom-testing (~> 2.0)
2729
rails-html-sanitizer (~> 1.0, >= 1.2.0)
28-
actiontext (6.0.6.1)
29-
actionpack (= 6.0.6.1)
30-
activerecord (= 6.0.6.1)
31-
activestorage (= 6.0.6.1)
32-
activesupport (= 6.0.6.1)
30+
actiontext (6.1.7.10)
31+
actionpack (= 6.1.7.10)
32+
activerecord (= 6.1.7.10)
33+
activestorage (= 6.1.7.10)
34+
activesupport (= 6.1.7.10)
3335
nokogiri (>= 1.8.5)
34-
actionview (6.0.6.1)
35-
activesupport (= 6.0.6.1)
36+
actionview (6.1.7.10)
37+
activesupport (= 6.1.7.10)
3638
builder (~> 3.1)
3739
erubi (~> 1.4)
3840
rails-dom-testing (~> 2.0)
3941
rails-html-sanitizer (~> 1.1, >= 1.2.0)
4042
active_record_extended (3.2.1)
4143
activerecord (>= 5.2, < 7.2.0)
4244
pg (< 3.0)
43-
activejob (6.0.6.1)
44-
activesupport (= 6.0.6.1)
45+
activejob (6.1.7.10)
46+
activesupport (= 6.1.7.10)
4547
globalid (>= 0.3.6)
46-
activemodel (6.0.6.1)
47-
activesupport (= 6.0.6.1)
48-
activerecord (6.0.6.1)
49-
activemodel (= 6.0.6.1)
50-
activesupport (= 6.0.6.1)
51-
activestorage (6.0.6.1)
52-
actionpack (= 6.0.6.1)
53-
activejob (= 6.0.6.1)
54-
activerecord (= 6.0.6.1)
48+
activemodel (6.1.7.10)
49+
activesupport (= 6.1.7.10)
50+
activerecord (6.1.7.10)
51+
activemodel (= 6.1.7.10)
52+
activesupport (= 6.1.7.10)
53+
activestorage (6.1.7.10)
54+
actionpack (= 6.1.7.10)
55+
activejob (= 6.1.7.10)
56+
activerecord (= 6.1.7.10)
57+
activesupport (= 6.1.7.10)
5558
marcel (~> 1.0)
56-
activesupport (6.0.6.1)
59+
mini_mime (>= 1.1.0)
60+
activesupport (6.1.7.10)
5761
concurrent-ruby (~> 1.0, >= 1.0.2)
58-
i18n (>= 0.7, < 2)
59-
minitest (~> 5.1)
60-
tzinfo (~> 1.1)
61-
zeitwerk (~> 2.2, >= 2.2.2)
62+
i18n (>= 1.6, < 2)
63+
minitest (>= 5.1)
64+
tzinfo (~> 2.0)
65+
zeitwerk (~> 2.3)
6266
addressable (2.8.0)
6367
public_suffix (>= 2.0.2, < 5.0)
6468
ast (2.4.0)
@@ -149,8 +153,8 @@ GEM
149153
faraday_middleware (1.2.1)
150154
faraday (~> 1.0)
151155
ffi (1.9.25)
152-
globalid (1.1.0)
153-
activesupport (>= 5.0)
156+
globalid (1.2.1)
157+
activesupport (>= 6.1)
154158
graphiql-rails (1.10.4)
155159
railties
156160
graphql (1.12.0)
@@ -184,7 +188,7 @@ GEM
184188
railties (>= 4)
185189
request_store (~> 1.0)
186190
logstash-event (1.2.02)
187-
loofah (2.24.0)
191+
loofah (2.24.1)
188192
crass (~> 1.0.2)
189193
nokogiri (>= 1.12.0)
190194
mail (2.8.1)
@@ -198,13 +202,13 @@ GEM
198202
mime-types-data (~> 3.2015)
199203
mime-types-data (3.2022.0105)
200204
mini_mime (1.1.5)
201-
mini_portile2 (2.8.8)
205+
mini_portile2 (2.8.9)
202206
minitest (5.25.5)
203207
msgpack (1.5.1)
204208
multi_json (1.13.1)
205209
multi_xml (0.6.0)
206210
multipart-post (2.2.0)
207-
net-imap (0.4.20)
211+
net-imap (0.4.22)
208212
date
209213
net-protocol
210214
net-pop (0.1.2)
@@ -260,43 +264,43 @@ GEM
260264
pundit (2.2.0)
261265
activesupport (>= 3.0.0)
262266
racc (1.8.1)
263-
rack (2.2.13)
267+
rack (2.2.16)
264268
rack-cors (1.1.1)
265269
rack (>= 2.0.0)
266270
rack-test (2.2.0)
267271
rack (>= 1.3)
268-
rails (6.0.6.1)
269-
actioncable (= 6.0.6.1)
270-
actionmailbox (= 6.0.6.1)
271-
actionmailer (= 6.0.6.1)
272-
actionpack (= 6.0.6.1)
273-
actiontext (= 6.0.6.1)
274-
actionview (= 6.0.6.1)
275-
activejob (= 6.0.6.1)
276-
activemodel (= 6.0.6.1)
277-
activerecord (= 6.0.6.1)
278-
activestorage (= 6.0.6.1)
279-
activesupport (= 6.0.6.1)
280-
bundler (>= 1.3.0)
281-
railties (= 6.0.6.1)
272+
rails (6.1.7.10)
273+
actioncable (= 6.1.7.10)
274+
actionmailbox (= 6.1.7.10)
275+
actionmailer (= 6.1.7.10)
276+
actionpack (= 6.1.7.10)
277+
actiontext (= 6.1.7.10)
278+
actionview (= 6.1.7.10)
279+
activejob (= 6.1.7.10)
280+
activemodel (= 6.1.7.10)
281+
activerecord (= 6.1.7.10)
282+
activestorage (= 6.1.7.10)
283+
activesupport (= 6.1.7.10)
284+
bundler (>= 1.15.0)
285+
railties (= 6.1.7.10)
282286
sprockets-rails (>= 2.0.0)
283287
rails-controller-testing (1.0.5)
284288
actionpack (>= 5.0.1.rc1)
285289
actionview (>= 5.0.1.rc1)
286290
activesupport (>= 5.0.1.rc1)
287-
rails-dom-testing (2.2.0)
291+
rails-dom-testing (2.3.0)
288292
activesupport (>= 5.0.0)
289293
minitest
290294
nokogiri (>= 1.6)
291295
rails-html-sanitizer (1.6.2)
292296
loofah (~> 2.21)
293297
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
294-
railties (6.0.6.1)
295-
actionpack (= 6.0.6.1)
296-
activesupport (= 6.0.6.1)
298+
railties (6.1.7.10)
299+
actionpack (= 6.1.7.10)
300+
activesupport (= 6.1.7.10)
297301
method_source
298-
rake (>= 0.8.7)
299-
thor (>= 0.20.3, < 2.0)
302+
rake (>= 12.2)
303+
thor (~> 1.0)
300304
rainbow (3.0.0)
301305
rake (13.2.1)
302306
ranked-model (0.4.11)
@@ -389,9 +393,9 @@ GEM
389393
base64
390394
concurrent-ruby (~> 1.0)
391395
rack (> 1, < 3)
392-
sprockets-rails (3.4.2)
393-
actionpack (>= 5.2)
394-
activesupport (>= 5.2)
396+
sprockets-rails (3.5.2)
397+
actionpack (>= 6.1)
398+
activesupport (>= 6.1)
395399
sprockets (>= 3.0.0)
396400
stoplight (3.0.2)
397401
redlock (~> 1.0)
@@ -403,12 +407,11 @@ GEM
403407
colorize (>= 0.8.1)
404408
rest-client (>= 2.0.2)
405409
thor (1.3.2)
406-
thread_safe (0.3.6)
407410
tilt (2.0.8)
408411
timeout (0.4.3)
409412
to_regexp (0.2.1)
410-
tzinfo (1.2.11)
411-
thread_safe (~> 0.1)
413+
tzinfo (2.0.6)
414+
concurrent-ruby (~> 1.0)
412415
unf (0.1.4)
413416
unf_ext
414417
unf_ext (0.0.8.2)
@@ -460,7 +463,7 @@ DEPENDENCIES
460463
puma (~> 5.6)
461464
pundit (~> 2.2.0)
462465
rack-cors
463-
rails (= 6.0.6.1)
466+
rails (= 6.1.7.10)
464467
rails-controller-testing
465468
ranked-model
466469
responders

0 commit comments

Comments
 (0)