projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2620-keep-serialize-io
[arvados.git]
/
services
/
api
/
Gemfile
diff --git
a/services/api/Gemfile
b/services/api/Gemfile
index 49c05923deea32e492fadce7be9fdedf51c13c7f..e50802ef9920585c00574691eda90b68b230df13 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'
# 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;
-# 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'
# fix bug https://github.com/collectiveidea/json_spec/issues/27
gem 'multi_json'
gem 'oj'
@@
-57,4
+63,6
@@
gem 'test_after_commit', :group => :test
gem 'google-api-client', '~> 0.6.3'
gem 'trollop'
gem 'google-api-client', '~> 0.6.3'
gem 'trollop'
-gem 'arvados-cli', '>= 0.1.20140310170846'
+gem 'themes_for_rails'
+
+gem 'arvados-cli', '>= 0.1.20140328152103'