aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert2018-01-08 14:01:13 +0100
committerRobert2018-01-08 14:01:13 +0100
commit6123fa3580b0048f39157c35cecef3c914e06b4c (patch)
tree15939baa35d07581bc2adf0804da7fcd5905ec46 /Gemfile
parentdcc56c4d02f9f71b13dd38251367306842cd10c7 (diff)
parent2ea51b513170b1b6578b47ca10b995e07ee11fef (diff)
downloadchouette-core-6123fa3580b0048f39157c35cecef3c914e06b4c.tar.bz2
Merge branch 'master' of github.com:af83/stif-boiv
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile5
1 files changed, 4 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 7c10b27e4..2a0da4c48 100644
--- a/Gemfile
+++ b/Gemfile
@@ -60,7 +60,7 @@ gem 'faraday', '~> 0.9.1'
platforms :ruby do
gem 'therubyracer', '~> 0.12'
gem 'pg'
- gem 'sqlite3'
+ #gem 'sqlite3'
end
gem 'activerecord-postgis-adapter', "~> 3.0.0"
@@ -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'
@@ -158,6 +160,7 @@ group :development do
gem 'bundler-audit'
gem 'spring-commands-rspec'
gem 'dbshell-rails'
+ gem 'rack-livereload'
platforms :ruby_20, :ruby_21, :ruby_22 do
gem 'better_errors'