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'
#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
# 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'