Commit d4cda0bf authored by Kerri Miller's avatar Kerri Miller

Merge branch 'sh-upgrade-statemachines-gem' into 'master'

Upgrade state_machines-activerecord to v0.8.0

See merge request gitlab-org/gitlab!50723
parents 74f789ef ecf78445
...@@ -189,7 +189,7 @@ group :puma do ...@@ -189,7 +189,7 @@ group :puma do
end end
# State machine # State machine
gem 'state_machines-activerecord', '~> 0.6.0' gem 'state_machines-activerecord', '~> 0.8.0'
# Issue tags # Issue tags
gem 'acts-as-taggable-on', '~> 6.0' gem 'acts-as-taggable-on', '~> 6.0'
......
...@@ -1144,12 +1144,12 @@ GEM ...@@ -1144,12 +1144,12 @@ GEM
sshkey (2.0.0) sshkey (2.0.0)
stackprof (0.2.15) stackprof (0.2.15)
state_machines (0.5.0) state_machines (0.5.0)
state_machines-activemodel (0.7.1) state_machines-activemodel (0.8.0)
activemodel (>= 4.1) activemodel (>= 5.1)
state_machines (>= 0.5.0) state_machines (>= 0.5.0)
state_machines-activerecord (0.6.0) state_machines-activerecord (0.8.0)
activerecord (>= 4.1) activerecord (>= 5.1)
state_machines-activemodel (>= 0.5.0) state_machines-activemodel (>= 0.8.0)
swd (1.1.2) swd (1.1.2)
activesupport (>= 3) activesupport (>= 3)
attr_required (>= 0.0.5) attr_required (>= 0.0.5)
...@@ -1513,7 +1513,7 @@ DEPENDENCIES ...@@ -1513,7 +1513,7 @@ DEPENDENCIES
sprockets (~> 3.7.0) sprockets (~> 3.7.0)
sshkey (~> 2.0) sshkey (~> 2.0)
stackprof (~> 0.2.15) stackprof (~> 0.2.15)
state_machines-activerecord (~> 0.6.0) state_machines-activerecord (~> 0.8.0)
sys-filesystem (~> 1.1.6) sys-filesystem (~> 1.1.6)
terser (= 1.0.2) terser (= 1.0.2)
test-prof (~> 0.12.0) test-prof (~> 0.12.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment