update to Rails 3.2

Gemfile

@@ -1,17 +1,17 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 3.1'
+gem 'rails', '~> 3.2'
 
 gem 'sqlite3'
 
 # Asset template engines
 gem 'json'
-gem 'sass-rails', "~> 3.1.0"
+gem 'sass-rails', "~> 3.2"
 gem 'haml'
 gem 'coffee-script'
 gem 'therubyracer'
 gem 'uglifier'
-gem 'twitter-bootstrap-rails'
+gem 'twitter-bootstrap-rails', "< 2.0.7"
 
 gem 'jquery-rails'
 gem 'simple-navigation'

Gemfile.lock

@@ -1,38 +1,37 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    albino (1.3.3)
-      posix-spawn (>= 0.3.6)
-    arel (2.2.1)
+    addressable (2.2.8)
+    arel (3.0.2)
     bcrypt-ruby (3.0.1)
+    blankslate (2.1.2.4)
     builder (3.0.0)
     cancan (1.6.7)
     capybara (1.1.2)
@@ -42,162 +41,167 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.2)
+    childprocess (0.3.2)
       ffi (~> 1.0.6)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.1.3)
+    coffee-script-source (1.3.1)
     commonjs (0.2.6)
-    cucumber (1.1.3)
+    cucumber (1.2.0)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.6.7)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.10.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.2.0)
-      capybara (>= 1.1.1)
-      cucumber (>= 1.1.1)
+    cucumber-rails (1.3.0)
+      capybara (>= 1.1.2)
+      cucumber (>= 1.1.8)
       nokogiri (>= 1.5.0)
-    database_cleaner (0.7.0)
-    devise (1.5.2)
+    database_cleaner (0.7.2)
+    devise (2.0.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
-      warden (~> 1.1)
-    devise_ldap_authenticatable (0.5.1)
-      devise (~> 1.5.0)
-      net-ldap (~> 0.2.2)
+      railties (~> 3.1)
+      warden (~> 1.1.1)
+    devise_ldap_authenticatable (0.4.4)
+      devise (> 1.0.4)
+      net-ldap (>= 0.1.1)
     diff-lcs (1.1.3)
     email_spec (1.2.1)
       mail (~> 2.2)
       rspec (~> 2.0)
     erubis (2.7.0)
-    execjs (1.2.9)
+    execjs (1.3.2)
       multi_json (~> 1.0)
     ffi (1.0.11)
-    gherkin (2.6.7)
+    gherkin (2.10.0)
       json (>= 1.4.6)
-    github-markup (0.5.3)
-    gollum (1.3.1)
-      albino (~> 1.3.2)
-      github-markup (>= 0.4.0, < 1.0.0)
+    github-markdown (0.4.1)
+    github-markup (0.7.2)
+    gollum (2.0.0)
+      github-markdown
+      github-markup (>= 0.7.0, < 1.0.0)
       grit (~> 2.4.1)
       mustache (>= 0.11.2, < 1.0.0)
       nokogiri (~> 1.4)
-      redcarpet
+      posix-spawn (~> 0.3.0)
+      pygments.rb (~> 0.2.0)
       sanitize (~> 2.0.0)
       sinatra (~> 1.0)
     grit (2.4.1)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
-    guard (1.0.0)
+    guard (1.0.2)
       ffi (>= 0.5.0)
       thor (~> 0.14.6)
-    guard-cucumber (0.7.5)
-      cucumber (>= 0.10)
+    guard-cucumber (0.8.0)
+      cucumber (>= 1.2.0)
       guard (>= 0.8.3)
-    guard-rspec (0.6.0)
+    guard-rspec (0.7.0)
       guard (>= 0.10.0)
-    guard-spork (0.5.2)
+    guard-spork (0.8.0)
       guard (>= 0.10.0)
       spork (>= 0.8.4)
-    haml (3.1.4)
+    haml (3.1.5)
     hike (1.2.1)
     i18n (0.6.0)
-    jquery-rails (1.0.18)
-      railties (~> 3.0)
+    journey (1.0.3)
+    jquery-rails (2.0.2)
+      railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.1)
-    json_pure (1.6.1)
+    json (1.7.1)
     less (2.2.1)
       commonjs (~> 0.2.6)
     less-rails (2.2.2)
       actionpack (>= 3.1)
       less (~> 2.2.0)
     libv8 (3.3.10.4)
-    mail (2.3.0)
+    libwebsocket (0.1.3)
+      addressable
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    multi_json (1.0.3)
+    mime-types (1.18)
+    multi_json (1.3.4)
     mustache (0.99.4)
-    net-ldap (0.2.2)
-    nokogiri (1.5.0)
-    orm_adapter (0.0.5)
+    net-ldap (0.3.1)
+    nokogiri (1.5.2)
+    orm_adapter (0.0.7)
     polyglot (0.3.3)
     posix-spawn (0.3.6)
-    rack (1.3.5)
-    rack-cache (1.1)
+    pygments.rb (0.2.12)
+      rubypython (~> 0.5.3)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-protection (1.1.4)
+    rack-protection (1.2.0)
       rack
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
     rdiscount (1.6.8)
     rdoc (3.9.4)
-    redcarpet (1.17.2)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    rspec-rails (2.7.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.7.0)
-    rubyzip (0.9.4)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.0)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    rspec-rails (2.10.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.10.0)
+    rubypython (0.5.3)
+      blankslate (>= 2.1.2.3)
+      ffi (~> 1.0.7)
+    rubyzip (0.9.8)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    sass (3.1.10)
-    sass-rails (3.1.5)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (~> 3.1.10)
-      tilt (~> 1.3.2)
-    selenium-webdriver (2.13.0)
-      childprocess (>= 0.2.1)
-      ffi (~> 1.0.9)
-      json_pure
+    sass (3.1.17)
+    sass-rails (3.2.5)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    selenium-webdriver (2.21.2)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
       rubyzip
-    simple-navigation (3.5.1)
+    simple-navigation (3.7.0)
       activesupport (>= 2.3.2)
-    sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    spork (0.8.5)
-    sprockets (2.0.3)
+    spork (0.9.1)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
-    term-ansicolor (1.0.7)
-    therubyracer (0.9.9)
+    sqlite3 (1.3.6)
+    therubyracer (0.10.1)
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.3)
@@ -208,11 +212,11 @@ GEM
       actionpack (>= 3.1)
       less-rails (~> 2.2.0)
       railties (>= 3.1)
-    tzinfo (0.3.31)
-    uglifier (1.1.0)
+    tzinfo (0.3.33)
+    uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    warden (1.1.0)
+    warden (1.1.1)
       rack (>= 1.0)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -236,14 +240,14 @@ DEPENDENCIES
   jquery-rails
   json
   net-ldap
-  rails (~> 3.1)
+  rails (~> 3.2)
   rdiscount
   rdoc (< 3.10)
   rspec-rails
-  sass-rails (~> 3.1.0)
+  sass-rails (~> 3.2)
   simple-navigation
   spork
   sqlite3
   therubyracer
-  twitter-bootstrap-rails
+  twitter-bootstrap-rails (< 2.0.7)
   uglifier

app/controllers/users_controller.rb

@@ -67,7 +67,7 @@ def reset_password
   end
 
   rescue_from CanCan::AccessDenied do |exception|
-    render :file => "#{Rails.root}/public/403.html", :status => 403, :layout => false
+    render :file => "#{Rails.root}/public/403", :status => 403, :layout => false, :format => :html
   end
 
   private

config/initializers/devise.rb

@@ -88,8 +88,9 @@
   # config.extend_remember_period = false
 
   # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = false
+  # to false if you are not using database authenticatable. Since false is no
+  # longer supported, this has to be set to true.
+  config.use_salt_as_remember_token = true
 
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.