summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPirate Praveen <praveen@debian.org>2015-11-09 09:11:42 -0500
committerPirate Praveen <praveen@debian.org>2015-11-09 09:11:42 -0500
commitddd3dd72fec5d31fc76023e10f824cc079f65b63 (patch)
tree301878cd07fc57d1b5872a0dcbf0687362e696d5
parente357e4fbab79b0d834590b623644476a2ef980f5 (diff)
downloadgitlab-ce-ddd3dd72fec5d31fc76023e10f824cc079f65b63.tar.gz
update Gemfile.lock
-rw-r--r--Gemfile.lock10
1 files changed, 8 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index dce728baf18..21cbf854c1d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -692,7 +692,13 @@ GEM
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
stamp (0.6.0)
- state_machine (1.2.0)
+ state_machines (0.4.0)
+ state_machines-activemodel (0.3.0)
+ activemodel (~> 4.1)
+ state_machines (>= 0.4.0)
+ state_machines-activerecord (0.3.0)
+ activerecord (~> 4.1)
+ state_machines-activemodel (>= 0.3.0)
stringex (2.5.2)
systemu (2.6.5)
task_list (1.0.2)
@@ -913,7 +919,7 @@ DEPENDENCIES
spring-commands-teaspoon (~> 0.0.2)
sprockets (~> 2.12.3)
stamp (~> 0.6.0)
- state_machine (~> 1.2.0)
+ state_machines-activerecord (~> 0.3.0)
task_list (~> 1.0.2)
teaspoon (~> 1.0.0)
teaspoon-jasmine (~> 2.2.0)