upgrade to rails 3.1.10, fixing issues along the way

Author: parasquid

Gemfile

@@ -1,13 +1,13 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.0'
+gem 'rails', '3.1.10'
 gem 'rake', '0.8.7'
 gem 'json', '1.4.6'
 gem 'jquery-rails'
 
 # Database
 gem "mongo"
-gem "mongoid"
+gem "mongoid", '~> 2'
 gem "bson_ext"
 
 gem "kaminari" # for paging
@@ -31,6 +31,7 @@ gem "thin"
 gem "haml"
 gem "formtastic", "1.2.4"
 gem "css3buttons", "1.0.1"
+gem 'modular-scale'
 
 # 3rd Party Services
 gem "gravtastic"
@@ -67,6 +68,7 @@ gem "sunspot_rails", "1.2.1"
 gem "has_permalink"
 
 # CodeMav Api
+gem 'crack'
 gem "rabl", "0.3.0"
 
 # Attach images to models and store in the s3 cloud
@@ -94,16 +96,16 @@ group :test do
   # rspec gems
   gem "rspec-rails"
   gem "factory_girl_rails"
-  
+
   # cucumber gems
   gem "cucumber", "1.0.3"
   gem "cucumber-rails", "1.0.2"
   gem "database_cleaner" # cleans database for every scenario run. works with mongoid now
   gem "launchy" # allows 'show me the page' to launch a browser
-  
+
   # mocks & stubs
   gem "mocha", "0.9.12"
-  
+
   # mock web calls
   gem "vcr"
   gem "fakeweb"

Gemfile.lock

@@ -1,35 +1,34 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
-      mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    actionmailer (3.1.10)
+      actionpack (= 3.1.10)
+      mail (~> 2.3.3)
+    actionpack (3.1.10)
+      activemodel (= 3.1.10)
+      activesupport (= 3.1.10)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.10)
+      activesupport (= 3.1.10)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
+    activerecord (3.1.10)
+      activemodel (= 3.1.10)
+      activesupport (= 3.1.10)
+      arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
-      multi_json (~> 1.0)
+    activeresource (3.1.10)
+      activemodel (= 3.1.10)
+      activesupport (= 3.1.10)
+    activesupport (3.1.10)
+      multi_json (>= 1.0, < 1.3)
     addressable (2.3.2)
     airbrake (3.1.6)
       builder
@@ -41,13 +40,12 @@ GEM
     bourbon (3.0.1)
       sass (>= 3.2.0)
       thor
-    bson (1.8.0)
-      activesupport
-    bson_ext (1.8.0)
-      bson (~> 1.8.0)
+    bson (1.8.1)
+    bson_ext (1.8.1)
+      bson (~> 1.8.1)
     builder (3.0.4)
     cancan (1.6.8)
-    capybara (2.0.1)
+    capybara (2.0.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -61,14 +59,20 @@ GEM
       mongoid
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
+    chunky_png (1.2.7)
     coffee-rails (3.1.1)
       coffee-script (>= 2.2.0)
       railties (~> 3.1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
-    connection_pool (0.9.3)
+    compass (0.12.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+    connection_pool (1.0.0)
+    crack (0.3.2)
     css3buttons (1.0.1)
       actionpack (>= 3.0.0)
     cucumber (1.0.3)
@@ -83,7 +87,7 @@ GEM
       nokogiri (>= 1.4.6)
     daemons (1.1.9)
     database_cleaner (0.9.1)
-    devise (2.1.2)
+    devise (2.2.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
@@ -104,7 +108,7 @@ GEM
     fakeweb (1.3.0)
     faraday (0.8.4)
       multipart-post (~> 1.1)
-    ffi (1.2.0)
+    ffi (1.3.1)
     fog (0.11.0)
       builder
       excon (~> 0.6.5)
@@ -115,26 +119,27 @@ GEM
       net-ssh (~> 2.1.4)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    foreman (0.60.2)
+    foreman (0.61.0)
       thor (>= 0.13.6)
     formatador (0.2.4)
     formtastic (1.2.4)
       actionpack (>= 2.3.7)
       activesupport (>= 2.3.7)
       i18n (~> 0.4)
+    fssm (0.2.9)
     geokit (1.6.5)
       multi_json
     gherkin (2.4.21)
       json (>= 1.4.6)
-    girl_friday (0.11.1)
-      connection_pool (~> 0.9.0)
+    girl_friday (0.11.2)
+      connection_pool (~> 1.0)
       rubinius-actor
     gravtastic (3.2.6)
     haml (3.1.7)
     has_permalink (0.1.4)
     hashie (1.2.0)
     hike (1.2.1)
-    httparty (0.9.0)
+    httparty (0.10.0)
       multi_json (~> 1.0)
       multi_xml
     i18n (0.6.1)
@@ -160,23 +165,24 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.19)
     mocha (0.9.12)
-    mongo (1.8.0)
-      bson (~> 1.8.0)
-    mongoid (3.0.15)
+    modular-scale (1.0.6)
+      compass (>= 0.12.1)
+      sass (>= 3.2.0)
+      sassy-math (>= 1.5)
+    mongo (1.8.1)
+      bson (~> 1.8.1)
+    mongoid (2.5.1)
       activemodel (~> 3.1)
-      moped (~> 1.1)
-      origin (~> 1.0)
+      mongo (~> 1.7)
       tzinfo (~> 0.3.22)
-    moped (1.3.1)
     multi_json (1.0.4)
-    multi_xml (0.5.1)
+    multi_xml (0.5.2)
     multipart-post (1.1.5)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-ssh (2.1.4)
     nokogiri (1.5.6)
     oauth (0.4.7)
-    origin (1.0.11)
     orm_adapter (0.4.0)
     pg (0.14.1)
     polyglot (0.3.3)
@@ -185,8 +191,8 @@ GEM
     pr_geohash (1.0.0)
     rabl (0.3.0)
       multi_json (~> 1.0.3)
-    rack (1.3.6)
-    rack-cache (1.0.3)
+    rack (1.3.9)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
@@ -196,17 +202,17 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
+    rails (3.1.10)
+      actionmailer (= 3.1.10)
+      actionpack (= 3.1.10)
+      activerecord (= 3.1.10)
+      activeresource (= 3.1.10)
+      activesupport (= 3.1.10)
       bundler (~> 1.0)
-      railties (= 3.1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
+      railties (= 3.1.10)
+    railties (3.1.10)
+      actionpack (= 3.1.10)
+      activesupport (= 3.1.10)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -234,8 +240,8 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-    rspec-rails (2.12.0)
+    rspec-mocks (2.12.1)
+    rspec-rails (2.12.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -249,12 +255,14 @@ GEM
     rubyzip (0.9.9)
     rufus-scheduler (2.0.17)
       tzinfo (>= 0.3.23)
-    sass (3.2.3)
-    sass-rails (3.1.6)
+    sass (3.2.5)
+    sass-rails (3.1.7)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
       sass (>= 3.1.10)
       tilt (~> 1.3.2)
+    sassy-math (1.5)
+      compass (~> 0.11)
     selenium-webdriver (2.27.2)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
@@ -275,7 +283,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
+    sqlite3 (1.3.7)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
     stack_overflow (0.0.9)
@@ -296,25 +304,20 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    twitter (2.2.1)
-      activesupport (>= 2.3.9, < 4)
-      activesupport (>= 2.3.9, < 4)
-      faraday (~> 0.7)
-      faraday (~> 0.7)
-      multi_json (~> 1.0)
+    twitter (4.4.4)
+      faraday (~> 0.8, < 0.10)
       multi_json (~> 1.0)
-      simple_oauth (~> 0.1)
-      simple_oauth (~> 0.1)
+      simple_oauth (~> 0.2)
     tzinfo (0.3.35)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    vcr (2.3.0)
+    vcr (2.4.0)
     vegas (0.1.11)
       rack (>= 1.0.0)
     warden (1.2.1)
       rack (>= 1.0)
-    websocket (1.0.5)
+    websocket (1.0.6)
     xpath (1.0.0)
       nokogiri (~> 1.3)
 
@@ -331,6 +334,7 @@ DEPENDENCIES
   carrierwave (= 0.5.7)
   carrierwave-mongoid (= 0.1.0)
   coffee-rails (~> 3.1.0)
+  crack
   css3buttons (= 1.0.1)
   cucumber (= 1.0.3)
   cucumber-rails (= 1.0.2)
@@ -353,12 +357,13 @@ DEPENDENCIES
   launchy
   linkedin
   mocha (= 0.9.12)
+  modular-scale
   mongo
-  mongoid
+  mongoid (~> 2)
   pg
   powify (= 0.8.5)
   rabl (= 0.3.0)
-  rails (= 3.1.0)
+  rails (= 3.1.10)
   rake (= 0.8.7)
   resque
   resque-scheduler

app/assets/stylesheets/application.css.scss

@@ -13,6 +13,7 @@
 // @import "forms";
 // @import "formtastic_changes";
 // @import "codemav";
+@import 'modular-scale';
 @import "bootstrap_profile";
 @import "profile_experience";
 @import "profile_search";
@@ -44,10 +45,4 @@
 
 #content {
   margin-top: 80px;
-}
-
-
-
-
-
-
+}