Merge pull request hotsh#560 from carols10cents/rails3.2

Rails 3.2

Gemfile

@@ -1,29 +1,34 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.6'
+gem 'rails', '3.2.8'
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  # Lock sass-rails at 3.1.4 because of an issue in sass-rails 3.1.5 & 6
-  # https://github.com/rails/sass-rails/issues/78
-  gem 'sass-rails', "= 3.1.4"
+  gem "sass", "~> 3.1.10"
+  gem 'sass-rails', "~> 3.2.5"
   gem 'compass-rails', "~> 1.0.3"
-  gem 'coffee-rails', "~> 3.1.0"
+  gem 'coffee-rails', "~> 3.2.2"
   gem 'uglifier', "~> 1.0.0"
 end
 
+gem "haml", "~> 3.1.4"
 gem "haml-rails", "~> 0.3.4"
 gem 'jquery-rails', "~> 1.0.12"
 
 gem 'airbrake', "~> 3.0.9"
 gem 'bcrypt-ruby', "~> 3.0.0"
 gem 'unicorn', "~> 4.0.1"
-gem 'omniauth', :git => 'git://github.com/intridea/omniauth.git'
-gem "mongo_mapper", "~> 0.9.2"
-gem "bson_ext", "~> 1.3.1"
+
+gem 'omniauth', "~> 1.1.0"
+gem "omniauth-twitter", "~> 0.0.12"
+
+gem "mongo_mapper", "~> 0.11.2"
+gem "mongo", "= 1.6.2"
+gem "bson", "= 1.6.2"
+gem "bson_ext", "= 1.6.2"
 gem "i18n", "~> 0.6.0"
-gem "twitter", "~> 1.6.2"
+gem "twitter", "~> 3.5.0"
 gem "pony", "~> 1.3"
 gem "rdiscount", "~> 1.6.8"
 gem "ostatus", "~> 0.0.11"