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

[arvados.git] / services / api / Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 25b2c2447ff632b094f3ba209473bfb7ebf80c4d..3b715d3a82c3edd0bcc4c1a5e0303126dfb083ff 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -15,7 +15,7 @@ end
 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'
@@ -62,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 'arvados-cli', '>= 0.1.20140328152103'
+gem 'themes_for_rails'
+
+gem 'arvados-cli', '>= 0.1.20140328152103'