[noosfero/noosfero][rails4] rails4: update to rails 4.2
Bráulio Bhavamitra
gitlab at gitlab.com
Fri Apr 3 17:23:32 BRT 2015
Bráulio Bhavamitra pushed to rails4 at Noosfero / noosfero
Commits:
2177068c by Braulio Bhavamitra at 2015-04-03T17:13:09Z
rails4: update to rails 4.2
- - - - -
3 changed files:
- Gemfile
- vendor/plugins/monkey_patches/init.rb
- − vendor/plugins/monkey_patches/white_list_sanitizer_unescape_before_reescape/init.rb
Changes:
=====================================
Gemfile
=====================================
--- 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'
# gems to enable rails3 behaviour
gem 'protected_attributes'
=====================================
vendor/plugins/monkey_patches/init.rb
=====================================
--- 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'
=====================================
vendor/plugins/monkey_patches/white_list_sanitizer_unescape_before_reescape/init.rb deleted
=====================================
--- 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(/<!/, '<!')
- final_text = final_text.gsub(/<!--.*\[if IE\]-->(.*)<!--\[endif\]-->/, '<!–-[if IE]>\1<![endif]-–>') #FIX for itheora comments
-
- final_text = final_text.gsub(/"/, '"') #FIX problems with archive.org
- final_text
- end
- end
- alias_method_chain :sanitize, :filter_fixes
-
-end
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/2177068ccbf1fa382a65e6ebcb6772db443c36d9
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150403/3d4cc37c/attachment.html>
More information about the Noosfero-dev
mailing list