Skip to content

Commit

Permalink
Update Rails to last 6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@ZeiP
ZeiP committed Jan 3, 2022
1 parent dfef3f3 commit 28bdaa2
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 63 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem 'coffee-rails', '~> 5.0.0'
gem 'jquery-rails', '~> 4.4'
gem 'jquery-ui-rails', '~>6.0.1'

gem 'rails', '~> 6.0.4'
gem 'rails', '~> 6.1'
gem 'sassc-rails', '~> 2.1.2'

gem 'bootstrap-sass', '3.4.1'
Expand Down
127 changes: 65 additions & 62 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,68 +4,72 @@ GEM
RedCloth (4.3.2)
aasm (5.2.0)
concurrent-ruby (~> 1.0)
actioncable (6.0.4.4)
actionpack (= 6.0.4.4)
actioncable (6.1.4.4)
actionpack (= 6.1.4.4)
activesupport (= 6.1.4.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.4.4)
actionpack (= 6.0.4.4)
activejob (= 6.0.4.4)
activerecord (= 6.0.4.4)
activestorage (= 6.0.4.4)
activesupport (= 6.0.4.4)
actionmailbox (6.1.4.4)
actionpack (= 6.1.4.4)
activejob (= 6.1.4.4)
activerecord (= 6.1.4.4)
activestorage (= 6.1.4.4)
activesupport (= 6.1.4.4)
mail (>= 2.7.1)
actionmailer (6.0.4.4)
actionpack (= 6.0.4.4)
actionview (= 6.0.4.4)
activejob (= 6.0.4.4)
actionmailer (6.1.4.4)
actionpack (= 6.1.4.4)
actionview (= 6.1.4.4)
activejob (= 6.1.4.4)
activesupport (= 6.1.4.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.4.4)
actionview (= 6.0.4.4)
activesupport (= 6.0.4.4)
rack (~> 2.0, >= 2.0.8)
actionpack (6.1.4.4)
actionview (= 6.1.4.4)
activesupport (= 6.1.4.4)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionpack-xml_parser (2.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
actiontext (6.0.4.4)
actionpack (= 6.0.4.4)
activerecord (= 6.0.4.4)
activestorage (= 6.0.4.4)
activesupport (= 6.0.4.4)
actiontext (6.1.4.4)
actionpack (= 6.1.4.4)
activerecord (= 6.1.4.4)
activestorage (= 6.1.4.4)
activesupport (= 6.1.4.4)
nokogiri (>= 1.8.5)
actionview (6.0.4.4)
activesupport (= 6.0.4.4)
actionview (6.1.4.4)
activesupport (= 6.1.4.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.4.4)
activesupport (= 6.0.4.4)
activejob (6.1.4.4)
activesupport (= 6.1.4.4)
globalid (>= 0.3.6)
activemodel (6.0.4.4)
activesupport (= 6.0.4.4)
activemodel (6.1.4.4)
activesupport (= 6.1.4.4)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (6.0.4.4)
activemodel (= 6.0.4.4)
activesupport (= 6.0.4.4)
activestorage (6.0.4.4)
actionpack (= 6.0.4.4)
activejob (= 6.0.4.4)
activerecord (= 6.0.4.4)
activerecord (6.1.4.4)
activemodel (= 6.1.4.4)
activesupport (= 6.1.4.4)
activestorage (6.1.4.4)
actionpack (= 6.1.4.4)
activejob (= 6.1.4.4)
activerecord (= 6.1.4.4)
activesupport (= 6.1.4.4)
marcel (~> 1.0.0)
activesupport (6.0.4.4)
mini_mime (>= 1.1.0)
activesupport (6.1.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
acts_as_list (1.0.4)
activerecord (>= 4.2)
ast (2.4.2)
Expand Down Expand Up @@ -180,20 +184,20 @@ GEM
rack (>= 1.2.0)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.4.4)
actioncable (= 6.0.4.4)
actionmailbox (= 6.0.4.4)
actionmailer (= 6.0.4.4)
actionpack (= 6.0.4.4)
actiontext (= 6.0.4.4)
actionview (= 6.0.4.4)
activejob (= 6.0.4.4)
activemodel (= 6.0.4.4)
activerecord (= 6.0.4.4)
activestorage (= 6.0.4.4)
activesupport (= 6.0.4.4)
bundler (>= 1.3.0)
railties (= 6.0.4.4)
rails (6.1.4.4)
actioncable (= 6.1.4.4)
actionmailbox (= 6.1.4.4)
actionmailer (= 6.1.4.4)
actionpack (= 6.1.4.4)
actiontext (= 6.1.4.4)
actionview (= 6.1.4.4)
activejob (= 6.1.4.4)
activemodel (= 6.1.4.4)
activerecord (= 6.1.4.4)
activestorage (= 6.1.4.4)
activesupport (= 6.1.4.4)
bundler (>= 1.15.0)
railties (= 6.1.4.4)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand All @@ -209,12 +213,12 @@ GEM
railties (>= 6.0.0, < 8)
rails_autolink (1.1.6)
rails (> 3.1)
railties (6.0.4.4)
actionpack (= 6.0.4.4)
activesupport (= 6.0.4.4)
railties (6.1.4.4)
actionpack (= 6.1.4.4)
activesupport (= 6.1.4.4)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rake (>= 0.13)
thor (~> 1.0)
rainbow (3.0.0)
rake (13.0.6)
rb-fsevent (0.11.0)
Expand Down Expand Up @@ -291,16 +295,15 @@ GEM
libv8 (~> 3.16.14.15)
ref
thor (1.1.0)
thread_safe (0.3.6)
tilt (2.0.10)
tolk (4.1.0)
rails (>= 5.0)
safe_yaml (>= 0.8.6)
sassc
tracks-chartjs-ror (3.6.4)
rails (>= 3.1)
tzinfo (1.2.9)
thread_safe (~> 0.1)
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (2.1.0)
Expand Down Expand Up @@ -344,7 +347,7 @@ DEPENDENCIES
pg (~> 1.2.3)
puma (~> 5.5)
rack-mini-profiler
rails (~> 6.0.4)
rails (~> 6.1)
rails-controller-testing
rails-dom-testing (~> 2.0.0)
rails_autolink
Expand Down

0 comments on commit 28bdaa2

Please sign in to comment.