X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/43773cb247a1fb744b57070b715bfa5d53a00822..cc988c81ad543eb4e8ad88416e4c2fcb937abd11:/services/api/Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 1dd00a0ee4..1ce85d8740 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -1,15 +1,29 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-gem 'rails', '3.1.10'
+gem 'rails', '~> 3.2.0'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
 
-#gem 'sqlite3'
+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.
+  gem 'simplecov', '~> 0.7.1', require: false
+  gem 'simplecov-rcov', require: false
+  gem 'mocha', require: false
+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;
-# 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'
@@ -17,8 +31,8 @@ gem 'oj'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '= 3.1.5'
-  gem 'coffee-rails', '~> 3.1.1'
+  gem 'sass-rails',   '>= 3.2.0'
+  gem 'coffee-rails', '~> 3.2.0'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   gem 'therubyracer'
@@ -44,7 +58,26 @@ 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'
+
+gem 'andand'
+
+gem 'test_after_commit', :group => :test
+
+gem 'google-api-client', '~> 0.6.3'
+gem 'trollop'
+gem 'faye-websocket'
+
+gem 'themes_for_rails'
+
+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'
+
+gem 'puma'
+gem 'sshkey'