diff options
| author | Alban Peignier | 2018-02-22 19:21:29 +0100 |
|---|---|---|
| committer | Alban Peignier | 2018-02-22 19:21:29 +0100 |
| commit | 7e3065d47441f3e4fc41678a80737eef12c50c84 (patch) | |
| tree | f37e7ce5ac1b35d6c260c824006fe369e67d1eeb | |
| parent | 02cd9a9e5d05ab9858e6de27e38cd6b56b919d69 (diff) | |
| download | chouette-core-7e3065d47441f3e4fc41678a80737eef12c50c84.tar.bz2 | |
Don't load activerecord-nulldb-adapter if RAILS_DB_ADAPTER isn't nulldb. Refs #6010
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 3 |
2 files changed, 1 insertions, 5 deletions
@@ -66,7 +66,6 @@ end gem 'activerecord-postgis-adapter', "~> 3.0.0" gem 'polylines' -gem 'activerecord-nulldb-adapter', require: false # Codifligne API gem 'codifligne', af83: 'stif-codifline-api' @@ -142,7 +141,7 @@ gem 'rake' gem 'devise-async' gem 'apartment', '~> 1.0.0' gem 'aasm' -gem 'activerecord-nulldb-adapter' +gem 'activerecord-nulldb-adapter' if ENV['RAILS_DB_ADAPTER'] == 'nulldb' gem 'puma', '~> 3.10.0' gem 'newrelic_rpm' diff --git a/Gemfile.lock b/Gemfile.lock index 046167e69..63d78f9cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -76,8 +76,6 @@ 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) @@ -597,7 +595,6 @@ 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) |