diff options
| author | Xinhui | 2017-02-22 16:04:53 +0100 |
|---|---|---|
| committer | Xinhui | 2017-02-22 16:04:53 +0100 |
| commit | 77d4aca6f3328e7918077e7f6c32462cf95caa84 (patch) | |
| tree | 1ea07d2e34fc3f07a177c12c243765294f7b1926 /Gemfile.lock | |
| parent | b88cd552930099714000393584355c314f045cb6 (diff) | |
| parent | 15e221c2fe06ebd6ca18d7a392ab05f95b59be74 (diff) | |
| download | chouette-core-77d4aca6f3328e7918077e7f6c32462cf95caa84.tar.bz2 | |
Merge branch 'refactoring_import'
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index f152ffd08..1c9f275e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,6 +115,10 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) + carrierwave (1.0.0) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) celluloid (0.16.0) timers (~> 4.0.0) choice (0.1.7) @@ -600,6 +604,7 @@ DEPENDENCIES capistrano-ext capistrano-npm capybara (~> 2.4.0) + carrierwave (~> 1.0) cocoon codifligne! coffee-rails (~> 4.0.0) |