Update Rails to 3.1.11

Gemfile

@@ -1,10 +1,11 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.20'
+gem 'rails', '3.1.11'
 
 gem "will_paginate", "~> 3.0.pre2"
 gem 'jammit'
 gem 'capistrano'
+gem 'pg'
 
 group :test do
   gem 'shoulda'
@@ -13,7 +14,7 @@ group :test do
 end
 
 group :development, :test do
-  gem 'sqlite3-ruby', :require => 'sqlite3'
+  gem 'pg'
 end
 
 group :production do

Gemfile.lock

@@ -5,57 +5,58 @@ GEM
       Platform (>= 0.4.0)
       open4
     Platform (0.4.0)
-    abstract (1.0.0)
-    actionmailer (3.0.20)
-      actionpack (= 3.0.20)
-      mail (~> 2.2.19)
-    actionpack (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-    activesupport (3.0.20)
-    arel (2.0.10)
-    builder (2.1.2)
+    actionmailer (3.1.11)
+      actionpack (= 3.1.11)
+      mail (~> 2.3.3)
+    actionpack (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.6)
+      rack-cache (~> 1.2)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.4)
+    activemodel (3.1.11)
+      activesupport (= 3.1.11)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
+      arel (~> 2.2.3)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.11)
+      activemodel (= 3.1.11)
+      activesupport (= 3.1.11)
+    activesupport (3.1.11)
+      multi_json (~> 1.0)
+    arel (2.2.3)
+    builder (3.0.4)
     capistrano (2.9.0)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
+    erubis (2.7.0)
     faker (0.9.4)
       i18n (~> 0.4)
     highline (1.6.8)
-    i18n (0.5.0)
+    hike (1.2.1)
+    i18n (0.6.1)
     jammit (0.6.5)
       yui-compressor (>= 0.9.3)
-    json (1.7.6)
+    json (1.7.7)
     machinist (1.0.6)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
+    mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.20.1)
+    mime-types (1.21)
+    multi_json (1.6.0)
     mysql2 (0.2.6)
     mysql2 (0.2.6-x86-mingw32)
     net-scp (1.0.4)
@@ -66,33 +67,42 @@ GEM
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
     open4 (1.3.0)
+    pg (0.14.1)
     polyglot (0.3.3)
-    rack (1.2.7)
-    rack-mount (0.6.14)
+    rack (1.3.10)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-test (0.5.7)
+    rack-ssl (1.3.3)
+      rack
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.0.20)
-      actionmailer (= 3.0.20)
-      actionpack (= 3.0.20)
-      activerecord (= 3.0.20)
-      activeresource (= 3.0.20)
-      activesupport (= 3.0.20)
+    rails (3.1.11)
+      actionmailer (= 3.1.11)
+      actionpack (= 3.1.11)
+      activerecord (= 3.1.11)
+      activeresource (= 3.1.11)
+      activesupport (= 3.1.11)
       bundler (~> 1.0)
-      railties (= 3.0.20)
-    railties (3.0.20)
-      actionpack (= 3.0.20)
-      activesupport (= 3.0.20)
+      railties (= 3.1.11)
+    railties (3.1.11)
+      actionpack (= 3.1.11)
+      activesupport (= 3.1.11)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.4)
+      thor (~> 0.14.6)
     rake (10.0.3)
-    rdoc (3.12)
+    rdoc (3.12.1)
       json (~> 1.4)
     shoulda (2.11.3)
-    sqlite3-ruby (1.3.1)
-    sqlite3-ruby (1.3.1-x86-mingw32)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     thor (0.14.6)
+    tilt (1.3.3)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -111,7 +121,7 @@ DEPENDENCIES
   jammit
   machinist
   mysql2
-  rails (= 3.0.20)
+  pg
+  rails (= 3.1.11)
   shoulda
-  sqlite3-ruby
   will_paginate (~> 3.0.pre2)

config/environments/development.rb

@@ -11,7 +11,6 @@
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send

config/initializers/session_store.rb

@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-Marblerun::Application.config.session_store :cookie_store, :key => '_marblerun_session'
+Marblerun::Application.config.session_store :cookie_store, :key => '_marblerunv2_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.