diff options
| author | Luc Donnet | 2017-12-21 15:55:21 +0100 |
|---|---|---|
| committer | Luc Donnet | 2017-12-21 15:55:21 +0100 |
| commit | 1d7a0cb4ce78603dac88c4054a658f02bf9fbb22 (patch) | |
| tree | 516415d7d825d6e421fecdc8c85f11afc0c3a176 /Gemfile.lock | |
| parent | bdaca45a64b362091b5fbbdd0c23bd20e01d9208 (diff) | |
| parent | a832fa35fee4b472053fd14a14e54221c42c11a8 (diff) | |
| download | chouette-core-1d7a0cb4ce78603dac88c4054a658f02bf9fbb22.tar.bz2 | |
Merge branch 'master' into 5316-migrate-compliance-control-and-check-attributes-from-hs
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7c305cb8a..9c59016e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -75,6 +75,8 @@ GEM activemodel (= 4.2.8) activesupport (= 4.2.8) arel (~> 6.0) + activerecord-nulldb-adapter (0.3.7) + activerecord (>= 2.0.0) activerecord-postgis-adapter (3.0.0) activerecord (~> 4.2) rgeo-activerecord (~> 4.0) @@ -564,6 +566,7 @@ DEPENDENCIES SyslogLogger aasm active_attr + activerecord-nulldb-adapter activerecord-postgis-adapter (~> 3.0.0) acts-as-taggable-on (~> 4.0.0) acts_as_list (~> 0.6.0) @@ -680,4 +683,4 @@ DEPENDENCIES will_paginate-bootstrap BUNDLED WITH - 1.15.4 + 1.16.0 |