Merge remote-tracking branch 'origin/master' into origin-2228-check-filter-uuid-columns

[arvados.git] / services / api / Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 49c05923deea32e492fadce7be9fdedf51c13c7f..25b2c2447ff632b094f3ba209473bfb7ebf80c4d 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -5,7 +5,13 @@ 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;
@@ -57,4 +63,4 @@ gem 'test_after_commit', :group => :test
 gem 'google-api-client', '~> 0.6.3'
 gem 'trollop'
 
-gem 'arvados-cli', '>= 0.1.20140310170846'
+#gem 'arvados-cli', '>= 0.1.20140328152103'