aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Peyraud2017-12-17 15:53:20 +0100
committerAlban Peignier2018-01-07 23:22:20 +0100
commit611b3e26b4fba91f7fcdd6a0ecb5f41ed7fba0f0 (patch)
treea8a0bb4a3486b8136fc3770727acfb5887ed1ce2
parent9f47c50619642f6c7e2ffc205aaec49f3ce5a7c3 (diff)
downloadchouette-core-611b3e26b4fba91f7fcdd6a0ecb5f41ed7fba0f0.tar.bz2
add puma nd nulldb adapter
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock2
2 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 7c10b27e4..8c40c98cb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -139,6 +139,8 @@ gem 'rake'
gem 'devise-async'
gem 'apartment', '~> 1.0.0'
gem 'aasm'
+gem 'activerecord-nulldb-adapter'
+gem 'puma', '~> 3.10.0'
gem 'newrelic_rpm'
gem 'letter_opener'
diff --git a/Gemfile.lock b/Gemfile.lock
index ade052d8a..d93d2b3d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -356,6 +356,7 @@ GEM
pry (~> 0.10)
pry-rails (0.3.6)
pry (>= 0.10.4)
+ puma (3.10.0)
pundit (1.1.0)
activesupport (>= 3.0.0)
quiet_assets (1.1.0)
@@ -648,6 +649,7 @@ DEPENDENCIES
polylines
pry-byebug
pry-rails
+ puma (~> 3.10.0)
pundit
quiet_assets
rabl