projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bugfix. Objects returned by owned_items are now sorted by uuid in order to get
[arvados.git]
/
services
/
api
/
Gemfile
diff --git
a/services/api/Gemfile
b/services/api/Gemfile
index ded0358394f1aa0dc8ffb4fa37b1aab41ca57043..e50802ef9920585c00574691eda90b68b230df13 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;
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'
@@
-63,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.20140311162926'
+gem 'themes_for_rails'
+
+gem 'arvados-cli', '>= 0.1.20140328152103'