Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-09-22 05:50:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2422 from TracksApp/aasm4

Browse source 
Update aasm to v4.
This commit is contained in:
Jyri-Petteri Paloposki 2020-07-17 21:36:40 +03:00 • committed by GitHub
commit 68bf0124bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -29,7 +29,7 @@ gem "RedCloth"
gem "sanitize", "~> 5.2" gem "sanitize", "~> 5.2"
gem "will_paginate" gem "will_paginate"
gem "acts_as_list" gem "acts_as_list"
gem "aasm", '~> 3.4.0' gem "aasm", '~> 4.12.3'
gem "htmlentities" gem "htmlentities"
gem "rails_autolink" gem "rails_autolink"
gem 'puma', '~> 4.3' gem 'puma', '~> 4.3'

5
Gemfile.lock
View file

@ -9,7 +9,8 @@ GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
RedCloth (4.3.2) RedCloth (4.3.2)
aasm (3.4.0) aasm (4.12.3)
concurrent-ruby (~> 1.0)
actioncable (5.2.4.3) actioncable (5.2.4.3)
actionpack (= 5.2.4.3) actionpack (= 5.2.4.3)
nio4r (~> 2.0) nio4r (~> 2.0)
@ -293,7 +294,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
RedCloth RedCloth
aasm (~> 3.4.0) aasm (~> 4.12.3)
actionpack-xml_parser (~> 2.0) actionpack-xml_parser (~> 2.0)
activemodel-serializers-xml (~> 1.0.1) activemodel-serializers-xml (~> 1.0.1)
acts_as_list acts_as_list