From edb090f0e31de49ade0791638aab6e1e770e1b4e Mon Sep 17 00:00:00 2001
From: Braulio Bhavamitra <braulio@eita.org.br>
Date: Fri, 3 Apr 2015 17:13:09 -0300
Subject: [PATCH] rails4: update to rails 4.2

---
 Gemfile                                                                             |  8 ++++----
 vendor/plugins/monkey_patches/init.rb                                               |  5 ++---
 vendor/plugins/monkey_patches/white_list_sanitizer_unescape_before_reescape/init.rb | 18 ------------------
 3 files changed, 6 insertions(+), 25 deletions(-)
 delete mode 100644 vendor/plugins/monkey_patches/white_list_sanitizer_unescape_before_reescape/init.rb

diff --git a/Gemfile b/Gemfile
index 77f5ef6..7c6d2e4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,16 +1,16 @@
 source "https://rubygems.org"
-gem 'rails',                    '~> 4.1.6'
+gem 'rails',                    '~> 4.2.0'
 gem 'minitest'
 gem 'fast_gettext',             '~> 0.6.8'
 gem 'acts-as-taggable-on',      '~> 3.4.2'
 gem 'rails_autolink',           '~> 1.1.5'
-gem 'pg',                       '~> 0.13.2'
+gem 'pg',                       '~> 0.18.1'
 gem 'rmagick',                  '~> 2.13.1'
 gem 'RedCloth',                 '~> 4.2.9'
 gem 'ruby-feedparser',          '~> 0.7'
 gem 'daemons',                  '~> 1.1.5'
 gem 'thin',                     '~> 1.3.1'
-gem 'nokogiri',                 '~> 1.5.5'
+gem 'nokogiri',                 '~> 1.6.0'
 gem 'will_paginate'
 gem 'pothoven-attachment_fu'
 gem 'delayed_job'
@@ -21,7 +21,7 @@ gem 'exception_notification',   '~> 4.0.1'
 gem 'gettext',                  '~> 2.2.1', :require => false
 gem 'locale',                   '~> 2.0.5'
 gem 'whenever', :require => false
-gem 'eita-jrails', '>= 0.9.7', :require => 'jrails'
+gem 'eita-jrails', '>= 0.9.8', require: 'jrails'
 
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
diff --git a/vendor/plugins/monkey_patches/init.rb b/vendor/plugins/monkey_patches/init.rb
index 98c0650..f9f2635 100644
--- a/vendor/plugins/monkey_patches/init.rb
+++ b/vendor/plugins/monkey_patches/init.rb
@@ -1,3 +1,2 @@
-require File.join(File.dirname(__FILE__), 'attachment_fu_validates_attachment/init')
-require File.join(File.dirname(__FILE__), 'attachment_fu/init')
-require File.join(File.dirname(__FILE__), 'white_list_sanitizer_unescape_before_reescape/init')
+require_relative 'attachment_fu_validates_attachment/init'
+require_relative 'attachment_fu/init'
diff --git a/vendor/plugins/monkey_patches/white_list_sanitizer_unescape_before_reescape/init.rb b/vendor/plugins/monkey_patches/white_list_sanitizer_unescape_before_reescape/init.rb
deleted file mode 100644
index ba56f32..0000000
--- a/vendor/plugins/monkey_patches/white_list_sanitizer_unescape_before_reescape/init.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# encoding: utf-8
-
-HTML::WhiteListSanitizer.module_eval do
-
-  #unescape html comments
-  def sanitize_with_filter_fixes(*args, &block)
-    text = sanitize_without_filter_fixes(*args, &block)
-    if text
-      final_text = text.gsub(/&lt;!/, '<!')
-      final_text = final_text.gsub(/<!--.*\[if IE\]-->(.*)<!--\[endif\]-->/, '<!–-[if IE]>\1<![endif]-–>') #FIX for itheora comments
-
-      final_text = final_text.gsub(/&amp;quot;/, '&quot;') #FIX problems with archive.org
-      final_text
-    end
-  end
-  alias_method_chain :sanitize, :filter_fixes
-
-end
--
libgit2 0.21.2