Update to rails 4.0.2

diff --git a/Gemfile b/Gemfile
index 94eb39681f56e81ed1087a039d258567fb5e9e69..5e7a2c16ebcb7727536e2c0e5c9e08e55899f79c 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 # Require rails
 source 'http://rubygems.org'
 
 # Require rails

-gem 'rails', '4.0.1'
+gem 'rails', '4.0.2'

 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19
 
 # Require things which have moved to gems in ruby 1.9
 gem 'bigdecimal', "~> 1.1.0", :platforms => :ruby_19

diff --git a/Gemfile.lock b/Gemfile.lock
index 2065dabdd725016a5384669e9cab72e71a6ebfa0..33bca9420de9bf556fea2bce1a2da3fd2054db8d 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,27 +2,27 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    actionmailer (4.0.1)
-      actionpack (= 4.0.1)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)

       mail (~> 2.5.4)
       mail (~> 2.5.4)

-    actionpack (4.0.1)
-      activesupport (= 4.0.1)
+    actionpack (4.0.2)
+      activesupport (= 4.0.2)

       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     actionpack-page_caching (1.0.2)
       actionpack (>= 4.0.0, < 5)

-    activemodel (4.0.1)
-      activesupport (= 4.0.1)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)

       builder (~> 3.1.0)
       builder (~> 3.1.0)

-    activerecord (4.0.1)
-      activemodel (= 4.0.1)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)

       activerecord-deprecated_finders (~> 1.0.2)
       activerecord-deprecated_finders (~> 1.0.2)

-      activesupport (= 4.0.1)
+      activesupport (= 4.0.2)

       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)

-    activesupport (4.0.1)
+    activesupport (4.0.2)

       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)


@@ -57,7 +57,7 @@ GEM
     http_accept_language (2.0.0)
     httpauth (0.2.0)
     httpclient (2.3.4.1)
     http_accept_language (2.0.0)
     httpauth (0.2.0)
     httpclient (2.3.4.1)

-    i18n (0.6.5)
+    i18n (0.6.8)

     iconv (0.1)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
     iconv (0.1)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)


@@ -116,20 +116,20 @@ GEM
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)
       rack (>= 1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)
       rack (>= 1.0)

-    rails (4.0.1)
-      actionmailer (= 4.0.1)
-      actionpack (= 4.0.1)
-      activerecord (= 4.0.1)
-      activesupport (= 4.0.1)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)

       bundler (>= 1.3.0, < 2.0)
       bundler (>= 1.3.0, < 2.0)

-      railties (= 4.0.1)
+      railties (= 4.0.2)

       sprockets-rails (~> 2.0.0)
     rails-i18n (4.0.0)
       i18n (~> 0.6)
       rails (~> 4.0.0)
       sprockets-rails (~> 2.0.0)
     rails-i18n (4.0.0)
       i18n (~> 0.6)
       rails (~> 4.0.0)

-    railties (4.0.1)
-      actionpack (= 4.0.1)
-      activesupport (= 4.0.1)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)

       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.0)


@@ -161,7 +161,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.38)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.38)

-    uglifier (2.3.1)
+    uglifier (2.3.2)

       execjs (>= 0.3.0)
       json (>= 1.8.0)
     validates_email_format_of (1.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     validates_email_format_of (1.5.3)


@@ -197,7 +197,7 @@ DEPENDENCIES
   psych
   r2
   rack-cors
   psych
   r2
   rack-cors

-  rails (= 4.0.1)
+  rails (= 4.0.2)

   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)
   rails-i18n (~> 4.0.0)
   redcarpet
   rinku (>= 1.2.2)

diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb
index c8bbdcce00d3675131fdd058fb9e4200f12c09e3..156eea4ecad2d8a1992f30d99970d1eb3166bee6 100644 (file)
--- a/config/initializers/i18n.rb
+++ b/config/initializers/i18n.rb
@@ -42,6 +42,8 @@ I18n::Backend::Simple.include(I18n::Backend::Fallbacks)
 
 I18n.fallbacks.map("no" => "nb")
 
 
 I18n.fallbacks.map("no" => "nb")
 

+I18n.enforce_available_locales = false
+

 Rails.configuration.after_initialize do |app|
   I18n.available_locales
 end
 Rails.configuration.after_initialize do |app|
   I18n.available_locales
 end

diff --git a/lib/rich_text.rb b/lib/rich_text.rb
index 87ea58933579e93c043d1ed28adf5f9ac7a0f094..533c8fbb4617b8af0540664d685433f9b2341ae5 100644 (file)
--- a/lib/rich_text.rb
+++ b/lib/rich_text.rb
@@ -10,6 +10,7 @@ module RichText
 
   class SimpleFormat
     include ActionView::Helpers::TextHelper
 
   class SimpleFormat
     include ActionView::Helpers::TextHelper

+    include ActionView::Helpers::OutputSafetyHelper

 
     def sanitize(text)
       Sanitize.clean(text, Sanitize::Config::OSM).html_safe
 
     def sanitize(text)
       Sanitize.clean(text, Sanitize::Config::OSM).html_safe