mirror of
https://github.com/TracksApp/tracks.git
synced 2025-12-16 15:20:13 +01:00
Upgrade Rails to 6.1
This commit is contained in:
Jyri-Petteri Paloposki
parent
9e662428b8
commit
7f567862d7
2 changed files with 79 additions and 75 deletions
2
Gemfile
2
Gemfile
|
|
@ -8,7 +8,7 @@ gem 'coffee-rails', '~> 5.0.0'
|
||||||
gem 'jquery-rails', '~> 4.6'
|
gem 'jquery-rails', '~> 4.6'
|
||||||
gem 'jquery-ui-rails', '~>6.0.1'
|
gem 'jquery-ui-rails', '~>6.0.1'
|
||||||
|
|
||||||
gem 'rails', '~> 6.0.0'
|
gem 'rails', '~> 6.1'
|
||||||
gem 'sassc-rails', '~> 2.1.2'
|
gem 'sassc-rails', '~> 2.1.2'
|
||||||
|
|
||||||
gem 'bootstrap-sass', '3.4.1'
|
gem 'bootstrap-sass', '3.4.1'
|
||||||
|
|
|
||||||
152
Gemfile.lock
152
Gemfile.lock
|
|
@ -4,70 +4,75 @@ GEM
|
||||||
RedCloth (4.3.3)
|
RedCloth (4.3.3)
|
||||||
aasm (5.5.0)
|
aasm (5.5.0)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
actioncable (6.0.6.1)
|
actioncable (6.1.7.8)
|
||||||
actionpack (= 6.0.6.1)
|
actionpack (= 6.1.7.8)
|
||||||
|
activesupport (= 6.1.7.8)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
websocket-driver (>= 0.6.1)
|
websocket-driver (>= 0.6.1)
|
||||||
actionmailbox (6.0.6.1)
|
actionmailbox (6.1.7.8)
|
||||||
actionpack (= 6.0.6.1)
|
actionpack (= 6.1.7.8)
|
||||||
activejob (= 6.0.6.1)
|
activejob (= 6.1.7.8)
|
||||||
activerecord (= 6.0.6.1)
|
activerecord (= 6.1.7.8)
|
||||||
activestorage (= 6.0.6.1)
|
activestorage (= 6.1.7.8)
|
||||||
activesupport (= 6.0.6.1)
|
activesupport (= 6.1.7.8)
|
||||||
mail (>= 2.7.1)
|
mail (>= 2.7.1)
|
||||||
actionmailer (6.0.6.1)
|
actionmailer (6.1.7.8)
|
||||||
actionpack (= 6.0.6.1)
|
actionpack (= 6.1.7.8)
|
||||||
actionview (= 6.0.6.1)
|
actionview (= 6.1.7.8)
|
||||||
activejob (= 6.0.6.1)
|
activejob (= 6.1.7.8)
|
||||||
|
activesupport (= 6.1.7.8)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (6.0.6.1)
|
actionpack (6.1.7.8)
|
||||||
actionview (= 6.0.6.1)
|
actionview (= 6.1.7.8)
|
||||||
activesupport (= 6.0.6.1)
|
activesupport (= 6.1.7.8)
|
||||||
rack (~> 2.0, >= 2.0.8)
|
rack (~> 2.0, >= 2.0.9)
|
||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||||
actionpack-xml_parser (2.0.1)
|
actionpack-xml_parser (2.0.1)
|
||||||
actionpack (>= 5.0)
|
actionpack (>= 5.0)
|
||||||
railties (>= 5.0)
|
railties (>= 5.0)
|
||||||
actiontext (6.0.6.1)
|
actiontext (6.1.7.8)
|
||||||
actionpack (= 6.0.6.1)
|
actionpack (= 6.1.7.8)
|
||||||
activerecord (= 6.0.6.1)
|
activerecord (= 6.1.7.8)
|
||||||
activestorage (= 6.0.6.1)
|
activestorage (= 6.1.7.8)
|
||||||
activesupport (= 6.0.6.1)
|
activesupport (= 6.1.7.8)
|
||||||
nokogiri (>= 1.8.5)
|
nokogiri (>= 1.8.5)
|
||||||
actionview (6.0.6.1)
|
actionview (6.1.7.8)
|
||||||
activesupport (= 6.0.6.1)
|
activesupport (= 6.1.7.8)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubi (~> 1.4)
|
erubi (~> 1.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||||
activejob (6.0.6.1)
|
activejob (6.1.7.8)
|
||||||
activesupport (= 6.0.6.1)
|
activesupport (= 6.1.7.8)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (6.0.6.1)
|
activemodel (6.1.7.8)
|
||||||
activesupport (= 6.0.6.1)
|
activesupport (= 6.1.7.8)
|
||||||
activemodel-serializers-xml (1.0.2)
|
activemodel-serializers-xml (1.0.2)
|
||||||
activemodel (> 5.x)
|
activemodel (> 5.x)
|
||||||
activesupport (> 5.x)
|
activesupport (> 5.x)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (6.0.6.1)
|
activerecord (6.1.7.8)
|
||||||
activemodel (= 6.0.6.1)
|
activemodel (= 6.1.7.8)
|
||||||
activesupport (= 6.0.6.1)
|
activesupport (= 6.1.7.8)
|
||||||
activestorage (6.0.6.1)
|
activestorage (6.1.7.8)
|
||||||
actionpack (= 6.0.6.1)
|
actionpack (= 6.1.7.8)
|
||||||
activejob (= 6.0.6.1)
|
activejob (= 6.1.7.8)
|
||||||
activerecord (= 6.0.6.1)
|
activerecord (= 6.1.7.8)
|
||||||
|
activesupport (= 6.1.7.8)
|
||||||
marcel (~> 1.0)
|
marcel (~> 1.0)
|
||||||
activesupport (6.0.6.1)
|
mini_mime (>= 1.1.0)
|
||||||
|
activesupport (6.1.7.8)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (>= 0.7, < 2)
|
i18n (>= 1.6, < 2)
|
||||||
minitest (~> 5.1)
|
minitest (>= 5.1)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 2.0)
|
||||||
zeitwerk (~> 2.2, >= 2.2.2)
|
zeitwerk (~> 2.3)
|
||||||
acts_as_list (1.1.0)
|
acts_as_list (1.2.1)
|
||||||
activerecord (>= 4.2)
|
activerecord (>= 6.1)
|
||||||
|
activesupport (>= 6.1)
|
||||||
ast (2.4.2)
|
ast (2.4.2)
|
||||||
autoprefixer-rails (10.4.7.0)
|
autoprefixer-rails (10.4.7.0)
|
||||||
execjs (~> 2)
|
execjs (~> 2)
|
||||||
|
|
@ -102,7 +107,7 @@ GEM
|
||||||
concurrent-ruby (1.3.1)
|
concurrent-ruby (1.3.1)
|
||||||
crass (1.0.6)
|
crass (1.0.6)
|
||||||
database_cleaner (1.99.0)
|
database_cleaner (1.99.0)
|
||||||
date (3.3.3)
|
date (3.3.4)
|
||||||
diff-lcs (1.5.0)
|
diff-lcs (1.5.0)
|
||||||
docile (1.1.5)
|
docile (1.1.5)
|
||||||
e2mmap (0.1.0)
|
e2mmap (0.1.0)
|
||||||
|
|
@ -116,8 +121,8 @@ GEM
|
||||||
ffi (1.16.3)
|
ffi (1.16.3)
|
||||||
font-awesome-sass (6.5.1)
|
font-awesome-sass (6.5.1)
|
||||||
sassc (~> 2.0)
|
sassc (~> 2.0)
|
||||||
globalid (1.1.0)
|
globalid (1.2.1)
|
||||||
activesupport (>= 5.0)
|
activesupport (>= 6.1)
|
||||||
highline (2.1.0)
|
highline (2.1.0)
|
||||||
htmlentities (4.3.4)
|
htmlentities (4.3.4)
|
||||||
i18n (1.14.5)
|
i18n (1.14.5)
|
||||||
|
|
@ -169,21 +174,21 @@ GEM
|
||||||
mime-types (3.4.1)
|
mime-types (3.4.1)
|
||||||
mime-types-data (~> 3.2015)
|
mime-types-data (~> 3.2015)
|
||||||
mime-types-data (3.2023.0218.1)
|
mime-types-data (3.2023.0218.1)
|
||||||
mini_mime (1.1.2)
|
mini_mime (1.1.5)
|
||||||
mini_portile2 (2.8.5)
|
mini_portile2 (2.8.5)
|
||||||
minitest (5.23.1)
|
minitest (5.23.1)
|
||||||
minitest-stub-const (0.6)
|
minitest-stub-const (0.6)
|
||||||
mocha (2.1.0)
|
mocha (2.1.0)
|
||||||
ruby2_keywords (>= 0.0.5)
|
ruby2_keywords (>= 0.0.5)
|
||||||
mysql2 (0.5.5)
|
mysql2 (0.5.5)
|
||||||
net-imap (0.3.6)
|
net-imap (0.4.12)
|
||||||
date
|
date
|
||||||
net-protocol
|
net-protocol
|
||||||
net-pop (0.1.2)
|
net-pop (0.1.2)
|
||||||
net-protocol
|
net-protocol
|
||||||
net-protocol (0.2.1)
|
net-protocol (0.2.2)
|
||||||
timeout
|
timeout
|
||||||
net-smtp (0.3.3)
|
net-smtp (0.5.0)
|
||||||
net-protocol
|
net-protocol
|
||||||
nio4r (2.7.3)
|
nio4r (2.7.3)
|
||||||
nokogiri (1.15.5)
|
nokogiri (1.15.5)
|
||||||
|
|
@ -202,20 +207,20 @@ GEM
|
||||||
rack (>= 1.2.0)
|
rack (>= 1.2.0)
|
||||||
rack-test (2.1.0)
|
rack-test (2.1.0)
|
||||||
rack (>= 1.3)
|
rack (>= 1.3)
|
||||||
rails (6.0.6.1)
|
rails (6.1.7.8)
|
||||||
actioncable (= 6.0.6.1)
|
actioncable (= 6.1.7.8)
|
||||||
actionmailbox (= 6.0.6.1)
|
actionmailbox (= 6.1.7.8)
|
||||||
actionmailer (= 6.0.6.1)
|
actionmailer (= 6.1.7.8)
|
||||||
actionpack (= 6.0.6.1)
|
actionpack (= 6.1.7.8)
|
||||||
actiontext (= 6.0.6.1)
|
actiontext (= 6.1.7.8)
|
||||||
actionview (= 6.0.6.1)
|
actionview (= 6.1.7.8)
|
||||||
activejob (= 6.0.6.1)
|
activejob (= 6.1.7.8)
|
||||||
activemodel (= 6.0.6.1)
|
activemodel (= 6.1.7.8)
|
||||||
activerecord (= 6.0.6.1)
|
activerecord (= 6.1.7.8)
|
||||||
activestorage (= 6.0.6.1)
|
activestorage (= 6.1.7.8)
|
||||||
activesupport (= 6.0.6.1)
|
activesupport (= 6.1.7.8)
|
||||||
bundler (>= 1.3.0)
|
bundler (>= 1.15.0)
|
||||||
railties (= 6.0.6.1)
|
railties (= 6.1.7.8)
|
||||||
sprockets-rails (>= 2.0.0)
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-controller-testing (1.0.5)
|
rails-controller-testing (1.0.5)
|
||||||
actionpack (>= 5.0.1.rc1)
|
actionpack (>= 5.0.1.rc1)
|
||||||
|
|
@ -235,12 +240,12 @@ GEM
|
||||||
actionview (> 3.1)
|
actionview (> 3.1)
|
||||||
activesupport (> 3.1)
|
activesupport (> 3.1)
|
||||||
railties (> 3.1)
|
railties (> 3.1)
|
||||||
railties (6.0.6.1)
|
railties (6.1.7.8)
|
||||||
actionpack (= 6.0.6.1)
|
actionpack (= 6.1.7.8)
|
||||||
activesupport (= 6.0.6.1)
|
activesupport (= 6.1.7.8)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 0.8.7)
|
rake (>= 12.2)
|
||||||
thor (>= 0.20.3, < 2.0)
|
thor (~> 1.0)
|
||||||
rainbow (3.1.1)
|
rainbow (3.1.1)
|
||||||
rake (13.1.0)
|
rake (13.1.0)
|
||||||
rb-fsevent (0.11.2)
|
rb-fsevent (0.11.2)
|
||||||
|
|
@ -325,22 +330,21 @@ GEM
|
||||||
libv8 (~> 3.16.14.15)
|
libv8 (~> 3.16.14.15)
|
||||||
ref
|
ref
|
||||||
thor (1.3.0)
|
thor (1.3.0)
|
||||||
thread_safe (0.3.6)
|
|
||||||
tilt (2.3.0)
|
tilt (2.3.0)
|
||||||
timeout (0.3.2)
|
timeout (0.4.1)
|
||||||
tolk (5.0.1)
|
tolk (5.0.1)
|
||||||
rails (>= 6.0)
|
rails (>= 6.0)
|
||||||
safe_yaml (>= 0.8.6)
|
safe_yaml (>= 0.8.6)
|
||||||
sprockets-rails (~> 3.4)
|
sprockets-rails (~> 3.4)
|
||||||
tracks-chartjs-ror (3.6.4)
|
tracks-chartjs-ror (3.6.4)
|
||||||
rails (>= 3.1)
|
rails (>= 3.1)
|
||||||
tzinfo (1.2.11)
|
tzinfo (2.0.6)
|
||||||
thread_safe (~> 0.1)
|
concurrent-ruby (~> 1.0)
|
||||||
uglifier (4.2.0)
|
uglifier (4.2.0)
|
||||||
execjs (>= 0.3.0, < 3)
|
execjs (>= 0.3.0, < 3)
|
||||||
unicode-display_width (2.5.0)
|
unicode-display_width (2.5.0)
|
||||||
uniform_notifier (1.16.0)
|
uniform_notifier (1.16.0)
|
||||||
websocket-driver (0.7.5)
|
websocket-driver (0.7.6)
|
||||||
websocket-extensions (>= 0.1.0)
|
websocket-extensions (>= 0.1.0)
|
||||||
websocket-extensions (0.1.5)
|
websocket-extensions (0.1.5)
|
||||||
will_paginate (4.0.0)
|
will_paginate (4.0.0)
|
||||||
|
|
@ -377,7 +381,7 @@ DEPENDENCIES
|
||||||
pg (~> 1.5.4)
|
pg (~> 1.5.4)
|
||||||
puma (~> 6.4)
|
puma (~> 6.4)
|
||||||
rack-mini-profiler
|
rack-mini-profiler
|
||||||
rails (~> 6.0.0)
|
rails (~> 6.1)
|
||||||
rails-controller-testing
|
rails-controller-testing
|
||||||
rails-dom-testing (~> 2.2.0)
|
rails-dom-testing (~> 2.2.0)
|
||||||
rails_autolink
|
rails_autolink
|
||||||
|
|
@ -397,4 +401,4 @@ DEPENDENCIES
|
||||||
yard
|
yard
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
2.2.33
|
2.4.19
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue