projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 54e83d883e29c5315f69ec409492604c1b17850e..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'
# 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;
gem 'pg'
# Start using multi_json once we are on Rails 3.2;
@@
-55,4
+61,6
@@
gem 'redis'
gem 'test_after_commit', :group => :test
gem 'google-api-client', '~> 0.6.3'
gem 'test_after_commit', :group => :test
gem 'google-api-client', '~> 0.6.3'
-gem 'trollop'
\ No newline at end of file
+gem 'trollop'
+
+#gem 'arvados-cli', '>= 0.1.20140328152103'