Merge branch 'upgrade-state_machines-activerecord' into 'master'

Update state_machines-activerecord from 0.3.0 to 0.4.0.

Includes support for Rails 5, working towards #14286.

See merge request !4295

2 files changed, 6 insertions, 6 deletions

diff --git a/Gemfile b/Gemfile
index e854a31b425..c236f37e14a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -121,7 +121,7 @@ group :unicorn do
 end
 
 # State machine
-gem "state_machines-activerecord", '~> 0.3.0'
+gem "state_machines-activerecord", '~> 0.4.0'
 # Run events after state machine commits
 gem 'after_commit_queue'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 4533aa31d5f..dbc0fd15ef4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -790,11 +790,11 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     state_machines (0.4.0)
-    state_machines-activemodel (0.3.0)
-      activemodel (~> 4.1)
+    state_machines-activemodel (0.4.0)
+      activemodel (>= 4.1, < 5.1)
       state_machines (>= 0.4.0)
-    state_machines-activerecord (0.3.0)
-      activerecord (~> 4.1)
+    state_machines-activerecord (0.4.0)
+      activerecord (>= 4.1, < 5.1)
       state_machines-activemodel (>= 0.3.0)
     stringex (2.5.2)
     systemu (2.6.5)
@@ -1043,7 +1043,7 @@ DEPENDENCIES
   spring-commands-spinach (~> 1.1.0)
   spring-commands-teaspoon (~> 0.0.2)
   sprockets (~> 3.6.0)
-  state_machines-activerecord (~> 0.3.0)
+  state_machines-activerecord (~> 0.4.0)
   task_list (~> 1.0.2)
   teaspoon (~> 1.1.0)
   teaspoon-jasmine (~> 2.2.0)