Skip to content

Commit d424f9a

Browse files
committed
Upgrade Rails from 5.2 => 6.0 and run app:upgrade script
1 parent 067aefa commit d424f9a

File tree

2 files changed

+63
-50
lines changed

2 files changed

+63
-50
lines changed

Gemfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22
source "https://rubygems.org"
33

4-
gem "rails", "5.2.8"
4+
gem "rails", "6.0.6"
55

66
ruby "2.7.7"
77

@@ -21,12 +21,11 @@ gem "pry-rails" # not in dev group in case running via prod/staging @ a training
2121
gem "puma"
2222
gem "rails-perftest"
2323
gem "rake"
24-
gem "responders" #For Rails 4.2 # LOCKED DOWN
24+
gem "responders"
2525
gem "ruby-prof"
26-
gem "sass-rails"
26+
gem "sassc-rails"
2727
gem "simplecov", require: false, group: :test
2828
gem "sqlite3"
29-
3029
gem "turbolinks"
3130
gem "uglifier"
3231
gem "unicorn"

Gemfile.lock

Lines changed: 60 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,63 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.2.8)
5-
actionpack (= 5.2.8)
4+
actioncable (6.0.6)
5+
actionpack (= 6.0.6)
66
nio4r (~> 2.0)
77
websocket-driver (>= 0.6.1)
8-
actionmailer (5.2.8)
9-
actionpack (= 5.2.8)
10-
actionview (= 5.2.8)
11-
activejob (= 5.2.8)
8+
actionmailbox (6.0.6)
9+
actionpack (= 6.0.6)
10+
activejob (= 6.0.6)
11+
activerecord (= 6.0.6)
12+
activestorage (= 6.0.6)
13+
activesupport (= 6.0.6)
14+
mail (>= 2.7.1)
15+
actionmailer (6.0.6)
16+
actionpack (= 6.0.6)
17+
actionview (= 6.0.6)
18+
activejob (= 6.0.6)
1219
mail (~> 2.5, >= 2.5.4)
1320
rails-dom-testing (~> 2.0)
14-
actionpack (5.2.8)
15-
actionview (= 5.2.8)
16-
activesupport (= 5.2.8)
21+
actionpack (6.0.6)
22+
actionview (= 6.0.6)
23+
activesupport (= 6.0.6)
1724
rack (~> 2.0, >= 2.0.8)
1825
rack-test (>= 0.6.3)
1926
rails-dom-testing (~> 2.0)
20-
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.2.8)
22-
activesupport (= 5.2.8)
27+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
28+
actiontext (6.0.6)
29+
actionpack (= 6.0.6)
30+
activerecord (= 6.0.6)
31+
activestorage (= 6.0.6)
32+
activesupport (= 6.0.6)
33+
nokogiri (>= 1.8.5)
34+
actionview (6.0.6)
35+
activesupport (= 6.0.6)
2336
builder (~> 3.1)
2437
erubi (~> 1.4)
2538
rails-dom-testing (~> 2.0)
26-
rails-html-sanitizer (~> 1.0, >= 1.0.3)
27-
activejob (5.2.8)
28-
activesupport (= 5.2.8)
39+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
40+
activejob (6.0.6)
41+
activesupport (= 6.0.6)
2942
globalid (>= 0.3.6)
30-
activemodel (5.2.8)
31-
activesupport (= 5.2.8)
32-
activerecord (5.2.8)
33-
activemodel (= 5.2.8)
34-
activesupport (= 5.2.8)
35-
arel (>= 9.0)
36-
activestorage (5.2.8)
37-
actionpack (= 5.2.8)
38-
activerecord (= 5.2.8)
39-
marcel (~> 1.0.0)
40-
activesupport (5.2.8)
43+
activemodel (6.0.6)
44+
activesupport (= 6.0.6)
45+
activerecord (6.0.6)
46+
activemodel (= 6.0.6)
47+
activesupport (= 6.0.6)
48+
activestorage (6.0.6)
49+
actionpack (= 6.0.6)
50+
activejob (= 6.0.6)
51+
activerecord (= 6.0.6)
52+
marcel (~> 1.0)
53+
activesupport (6.0.6)
4154
concurrent-ruby (~> 1.0, >= 1.0.2)
4255
i18n (>= 0.7, < 2)
4356
minitest (~> 5.1)
4457
tzinfo (~> 1.1)
58+
zeitwerk (~> 2.2, >= 2.2.2)
4559
addressable (2.8.4)
4660
public_suffix (>= 2.0.2, < 6.0)
47-
arel (9.0.0)
4861
aruba (2.1.0)
4962
bundler (>= 1.17, < 3.0)
5063
childprocess (>= 2.0, < 5.0)
@@ -241,18 +254,20 @@ GEM
241254
rack
242255
rack-test (2.1.0)
243256
rack (>= 1.3)
244-
rails (5.2.8)
245-
actioncable (= 5.2.8)
246-
actionmailer (= 5.2.8)
247-
actionpack (= 5.2.8)
248-
actionview (= 5.2.8)
249-
activejob (= 5.2.8)
250-
activemodel (= 5.2.8)
251-
activerecord (= 5.2.8)
252-
activestorage (= 5.2.8)
253-
activesupport (= 5.2.8)
257+
rails (6.0.6)
258+
actioncable (= 6.0.6)
259+
actionmailbox (= 6.0.6)
260+
actionmailer (= 6.0.6)
261+
actionpack (= 6.0.6)
262+
actiontext (= 6.0.6)
263+
actionview (= 6.0.6)
264+
activejob (= 6.0.6)
265+
activemodel (= 6.0.6)
266+
activerecord (= 6.0.6)
267+
activestorage (= 6.0.6)
268+
activesupport (= 6.0.6)
254269
bundler (>= 1.3.0)
255-
railties (= 5.2.8)
270+
railties (= 6.0.6)
256271
sprockets-rails (>= 2.0.0)
257272
rails-dom-testing (2.1.1)
258273
activesupport (>= 5.0.0)
@@ -262,12 +277,12 @@ GEM
262277
loofah (~> 2.21)
263278
nokogiri (~> 1.14)
264279
rails-perftest (0.0.7)
265-
railties (5.2.8)
266-
actionpack (= 5.2.8)
267-
activesupport (= 5.2.8)
280+
railties (6.0.6)
281+
actionpack (= 6.0.6)
282+
activesupport (= 6.0.6)
268283
method_source
269284
rake (>= 0.8.7)
270-
thor (>= 0.19.0, < 2.0)
285+
thor (>= 0.20.3, < 2.0)
271286
rainbow (3.1.1)
272287
raindrops (0.20.1)
273288
rake (13.0.6)
@@ -327,8 +342,6 @@ GEM
327342
rubocop (>= 1.33.0, < 2.0)
328343
ruby-prof (1.6.3)
329344
ruby-progressbar (1.13.0)
330-
sass-rails (6.0.0)
331-
sassc-rails (~> 2.1, >= 2.1.1)
332345
sassc (2.4.0)
333346
ffi (~> 1.9)
334347
sassc-rails (2.1.2)
@@ -380,6 +393,7 @@ GEM
380393
websocket-extensions (0.1.5)
381394
xpath (3.2.0)
382395
nokogiri (~> 1.8)
396+
zeitwerk (2.6.10)
383397

384398
PLATFORMS
385399
ruby
@@ -410,15 +424,15 @@ DEPENDENCIES
410424
pry-rails
411425
puma
412426
rack-livereload
413-
rails (= 5.2.8)
427+
rails (= 6.0.6)
414428
rails-perftest
415429
rake
416430
rb-fsevent
417431
responders
418432
rspec-rails
419433
rubocop-github
420434
ruby-prof
421-
sass-rails
435+
sassc-rails
422436
simplecov
423437
sqlite3
424438
test-unit

0 commit comments

Comments
 (0)