summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2016-05-25 15:04:21 -0600
committerConnor Shea <connor.james.shea@gmail.com>2016-05-25 15:17:53 -0600
commitee0d3abcb8b3c8572be9dac1926c3f77f2636a9e (patch)
tree22267af83cb5f197870d58d8a5fec31e515760fa
parent22bd28590743268de012e7861b768a8e8d702c88 (diff)
downloadgitlab-ce-ee0d3abcb8b3c8572be9dac1926c3f77f2636a9e.tar.gz
Update state_machines-activerecord from 0.3.0 to 0.4.0.
No changelog, see commits: https://github.com/state-machines/state_machines-activerecord/commits/master Includes Rails 5 support.
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock10
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)