Merge branch 'master' into 3618-column-ordering

[arvados.git] / services / api / Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 7219fe4a22662c0a5650a1a53158015eb20131aa..996d3fc7da560cca5c163a6c3e9dee558d2359b9 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -6,6 +6,7 @@ gem 'rails', '~> 3.2.0'
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
 
 group :test, :development do
+  gem 'factory_girl_rails'
   # Note: "require: false" here tells bunder not to automatically
   # 'require' the packages during application startup. Installation is
   # still mandatory.
@@ -70,9 +71,11 @@ gem 'database_cleaner'
 
 gem 'themes_for_rails'
 
-gem 'arvados-cli', '>= 0.1.20140708213257'
+gem 'arvados', '>= 0.1.20140919104705'
+gem 'arvados-cli', '>= 0.1.20141014201516'
 
 # pg_power lets us use partial indexes in schema.rb in Rails 3
 gem 'pg_power'
 
 gem 'puma'
+gem 'sshkey'