Merge branch 'rails3.10'

Gemfile

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'mysql2', '0.2.6' if ENV['DB'].nil? || ENV['DB'] == "mysql"
 gem 'pg' if ENV['DB'].nil? || ENV['DB'] == "postgres"
 gem 'sqlite3' if ENV['DB'].nil? || ENV['DB'] == "sqlite"
-gem 'rails', '3.0.9'
+gem 'rails', '3.0.10'
 gem 'foreigner', '0.9.1'
 gem 'activerecord-import'
 

Gemfile.lock

@@ -71,12 +71,12 @@ GEM
     Platform (0.4.0)
     SystemTimer (1.2.1)
     abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
+    actionmailer (3.0.10)
+      actionpack (= 3.0.10)
       mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -84,22 +84,22 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
     activerecord-import (0.2.8)
       activerecord (~> 3.0pre)
       activerecord (~> 3.0pre)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+    activesupport (3.0.10)
     addressable (2.2.4)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
@@ -168,7 +168,7 @@ GEM
     devise_invitable (0.5.0)
       devise (~> 1.3.1)
       rails (<= 3.2, >= 3.0.0)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     em-synchrony (0.2.0)
       eventmachine (>= 0.12.9)
     erubis (2.6.6)
@@ -176,9 +176,9 @@ GEM
     eventmachine (0.12.10)
     excon (0.2.4)
     extlib (0.9.15)
-    factory_girl (2.0.5)
-    factory_girl_rails (1.1.0)
-      factory_girl (~> 2.0.0)
+    factory_girl (2.1.0)
+    factory_girl_rails (1.2.0)
+      factory_girl (~> 2.1.0)
       railties (>= 3.0.0)
     faraday (0.6.1)
       addressable (~> 2.2.4)
@@ -205,13 +205,13 @@ GEM
     foreman (0.20.0)
       term-ansicolor (~> 1.0.5)
       thor (>= 0.13.6)
-    formatador (0.2.0)
+    formatador (0.2.1)
     fuubar (0.0.6)
       rspec (~> 2.0)
       rspec-instafail (~> 0.1.8)
       ruby-progressbar (~> 0.0.10)
     gem_plugin (0.2.3)
-    gherkin (2.4.16)
+    gherkin (2.4.18)
       json (>= 1.4.6)
     haml (3.1.2)
     hashie (1.0.0)
@@ -235,9 +235,10 @@ GEM
       rack (>= 1.1)
       rspec (>= 1.3.1)
       selenium-webdriver (>= 0.1.3)
-    jasmine-core (1.1.0.rc3)
+    jasmine-core (1.1.0.rc4)
     json (1.4.6)
-    json_pure (1.5.3)
+    json_pure (1.5.4)
+      spruz (~> 0.2.8)
     jwt (0.1.3)
       json (>= 1.2.4)
     linecache (0.43)
@@ -336,19 +337,19 @@ GEM
       ruby-openid (>= 2.1.8)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.0.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
       bundler (~> 1.0)
-      railties (= 3.0.9)
+      railties (= 3.0.10)
     rails-i18n (0.1.7)
       i18n (~> 0.5)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
@@ -417,6 +418,7 @@ GEM
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
+    spruz (0.2.13)
     sqlite3 (1.3.4)
     subexec (0.0.4)
     systemu (2.3.0)
@@ -507,7 +509,7 @@ DEPENDENCIES
   ohai (= 0.5.8)
   omniauth (= 0.2.6)
   pg
-  rails (= 3.0.9)
+  rails (= 3.0.10)
   rails-i18n
   rcov
   redcarpet!

config/environments/development.rb

@@ -15,7 +15,6 @@ Diaspora::Application.configure do
 
   # 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