Skip to content

Commit

Permalink
Merge pull request #2422 from TracksApp/aasm4
Browse files Browse the repository at this point in the history
Update aasm to v4.
  • Loading branch information
ZeiP authored Jul 17, 2020
2 parents cb6ec75 + 183dd48 commit 68bf012
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ gem "RedCloth"
gem "sanitize", "~> 5.2"
gem "will_paginate"
gem "acts_as_list"
gem "aasm", '~> 3.4.0'
gem "aasm", '~> 4.12.3'
gem "htmlentities"
gem "rails_autolink"
gem 'puma', '~> 4.3'
Expand Down
5 changes: 3 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.2)
aasm (3.4.0)
aasm (4.12.3)
concurrent-ruby (~> 1.0)
actioncable (5.2.4.3)
actionpack (= 5.2.4.3)
nio4r (~> 2.0)
Expand Down Expand Up @@ -293,7 +294,7 @@ PLATFORMS

DEPENDENCIES
RedCloth
aasm (~> 3.4.0)
aasm (~> 4.12.3)
actionpack-xml_parser (~> 2.0)
activemodel-serializers-xml (~> 1.0.1)
acts_as_list
Expand Down

0 comments on commit 68bf012

Please sign in to comment.