X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/155848c15844554a5d5fd50f9577aa2e19767d9e..b24080d865e86418a0f051aaa535c1e98318851c:/Gemfile

diff --git a/Gemfile b/Gemfile
index 663260b5d2..1dd00a0ee4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.5'
+gem 'rails', '3.1.10'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
@@ -8,12 +8,16 @@ gem 'rails', '3.1.5'
 #gem 'sqlite3'
 gem 'pg'
 
-gem 'json'
+# 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 
+# fix bug https://github.com/collectiveidea/json_spec/issues/27
+gem 'multi_json'
+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 'sass-rails',   '= 3.1.5'
   gem 'coffee-rails', '~> 3.1.1'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
@@ -36,3 +40,11 @@ gem 'jquery-rails'
 # To use debugger
 # gem 'ruby-debug'
 
+gem 'rvm-capistrano', :group => :test
+
+gem 'acts_as_api'
+
+gem 'passenger', :group => :production
+
+gem 'omniauth', '1.1.1'
+gem 'omniauth-oauth2', '1.1.1'