Merge branch 'master' of git.clinicalfuture.com:arvados

[arvados.git] / services / api / Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 2d3a07fb541155c6619b601ed6b416c19afbd761..3b715d3a82c3edd0bcc4c1a5e0303126dfb083ff 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -5,11 +5,17 @@ gem 'rails', '~> 3.2.0'
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
 
-#gem 'sqlite3'
+group :test, :development do
+  gem 'sqlite3'
+end
+
+# This might not be needed in :test and :development, but we load it
+# anyway to make sure it always gets in Gemfile.lock and to help
+# reveal install problems sooner rather than later.
 gem 'pg'
 
 # Start using multi_json once we are on Rails 3.2;
-# Rails 3.1 has a dependency on multi_json < 1.3.0 but we need version 1.3.4 to 
+# Rails 3.1 has a dependency on multi_json < 1.3.0 but we need version 1.3.4 to
 # fix bug https://github.com/collectiveidea/json_spec/issues/27
 gem 'multi_json'
 gem 'oj'
@@ -56,5 +62,9 @@ gem 'test_after_commit', :group => :test
 
 gem 'google-api-client', '~> 0.6.3'
 gem 'trollop'
+gem 'faye-websocket'
+gem 'database_cleaner'
+
+gem 'themes_for_rails'
 
-gem 'arvados-cli', '>= 0.1.20140311162926'
+gem 'arvados-cli', '>= 0.1.20140328152103'