Merge branch 'master' into 5200-anonymous-download

[arvados.git] / services / api / Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 67cf109ff3fa2d343ac2a2bbda8dc9d6b8fa2053..70f67d5d76b10ecd5798c021045398372c4497a9 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -7,6 +7,8 @@ gem 'rails', '~> 3.2.0'
 
 group :test, :development do
   gem 'factory_girl_rails'
+  gem 'database_cleaner'
+  gem 'ruby-prof'
   # Note: "require: false" here tells bunder not to automatically
   # 'require' the packages during application startup. Installation is
   # still mandatory.
@@ -55,7 +57,7 @@ gem 'rvm-capistrano', :group => :test
 
 gem 'acts_as_api'
 
-gem 'passenger', :group => :production
+gem 'passenger'
 
 gem 'omniauth', '1.1.1'
 gem 'omniauth-oauth2', '1.1.1'
@@ -67,12 +69,11 @@ gem 'test_after_commit', :group => :test
 gem 'google-api-client', '~> 0.6.3'
 gem 'trollop'
 gem 'faye-websocket'
-gem 'database_cleaner'
 
 gem 'themes_for_rails'
 
-gem 'arvados', '>= 0.1.20140919104705'
-gem 'arvados-cli', '>= 0.1.20140919104705'
+gem 'arvados', '>= 0.1.20150210011250'
+gem 'arvados-cli', '>= 0.1.20150128223752'
 
 # pg_power lets us use partial indexes in schema.rb in Rails 3
 gem 'pg_power'