X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e6eb23c28e300c901acd2900c27544901f42ba27..1498ac2bab4aabdd71066e4644ad20a6ac555827:/Gemfile

diff --git a/Gemfile b/Gemfile
index a54ddf479e..1dd00a0ee4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,11 @@ gem 'rails', '3.1.10'
 #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.
@@ -41,3 +45,6 @@ gem 'rvm-capistrano', :group => :test
 gem 'acts_as_api'
 
 gem 'passenger', :group => :production
+
+gem 'omniauth', '1.1.1'
+gem 'omniauth-oauth2', '1.1.1'