diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-10 12:20:59 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-10 12:20:59 +0000 |
| commit | 8972aef55865263833f7d30188c4a49c83e7f001 (patch) | |
| tree | 0ec942a4a69f0df195a05f0fc6194c7928defc05 /Gemfile.lock | |
| parent | 354b69dde2ba399a4269a0f544fd7a4e399d8b7e (diff) | |
| parent | ddd3dd72fec5d31fc76023e10f824cc079f65b63 (diff) | |
| download | gitlab-ce-8972aef55865263833f7d30188c4a49c83e7f001.tar.gz | |
Merge branch 'state-machine-to-state-machines-activerecord' into 'master'
Switch to state_machines-activerecord (Fixes: #3374)
state_machine is unmaintained
See merge request !1764
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d358e236302..1688ea4d9d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -686,7 +686,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) @@ -905,7 +911,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) |