Commit edb090f0e31de49ade0791638aab6e1e770e1b4e
1 parent
a1dad6ba
Exists in
staging
and in
39 other branches
rails4: update to rails 4.2
Showing
3 changed files
with
6 additions
and
25 deletions
Show diff stats
Gemfile
1 | source "https://rubygems.org" | 1 | source "https://rubygems.org" |
2 | -gem 'rails', '~> 4.1.6' | 2 | +gem 'rails', '~> 4.2.0' |
3 | gem 'minitest' | 3 | gem 'minitest' |
4 | gem 'fast_gettext', '~> 0.6.8' | 4 | gem 'fast_gettext', '~> 0.6.8' |
5 | gem 'acts-as-taggable-on', '~> 3.4.2' | 5 | gem 'acts-as-taggable-on', '~> 3.4.2' |
6 | gem 'rails_autolink', '~> 1.1.5' | 6 | gem 'rails_autolink', '~> 1.1.5' |
7 | -gem 'pg', '~> 0.13.2' | 7 | +gem 'pg', '~> 0.18.1' |
8 | gem 'rmagick', '~> 2.13.1' | 8 | gem 'rmagick', '~> 2.13.1' |
9 | gem 'RedCloth', '~> 4.2.9' | 9 | gem 'RedCloth', '~> 4.2.9' |
10 | gem 'ruby-feedparser', '~> 0.7' | 10 | gem 'ruby-feedparser', '~> 0.7' |
11 | gem 'daemons', '~> 1.1.5' | 11 | gem 'daemons', '~> 1.1.5' |
12 | gem 'thin', '~> 1.3.1' | 12 | gem 'thin', '~> 1.3.1' |
13 | -gem 'nokogiri', '~> 1.5.5' | 13 | +gem 'nokogiri', '~> 1.6.0' |
14 | gem 'will_paginate' | 14 | gem 'will_paginate' |
15 | gem 'pothoven-attachment_fu' | 15 | gem 'pothoven-attachment_fu' |
16 | gem 'delayed_job' | 16 | gem 'delayed_job' |
@@ -21,7 +21,7 @@ gem 'exception_notification', '~> 4.0.1' | @@ -21,7 +21,7 @@ gem 'exception_notification', '~> 4.0.1' | ||
21 | gem 'gettext', '~> 2.2.1', :require => false | 21 | gem 'gettext', '~> 2.2.1', :require => false |
22 | gem 'locale', '~> 2.0.5' | 22 | gem 'locale', '~> 2.0.5' |
23 | gem 'whenever', :require => false | 23 | gem 'whenever', :require => false |
24 | -gem 'eita-jrails', '>= 0.9.7', :require => 'jrails' | 24 | +gem 'eita-jrails', '>= 0.9.8', require: 'jrails' |
25 | 25 | ||
26 | # asset pipeline | 26 | # asset pipeline |
27 | gem 'uglifier', '>= 1.0.3' | 27 | gem 'uglifier', '>= 1.0.3' |
vendor/plugins/monkey_patches/init.rb
1 | -require File.join(File.dirname(__FILE__), 'attachment_fu_validates_attachment/init') | ||
2 | -require File.join(File.dirname(__FILE__), 'attachment_fu/init') | ||
3 | -require File.join(File.dirname(__FILE__), 'white_list_sanitizer_unescape_before_reescape/init') | 1 | +require_relative 'attachment_fu_validates_attachment/init' |
2 | +require_relative 'attachment_fu/init' |
vendor/plugins/monkey_patches/white_list_sanitizer_unescape_before_reescape/init.rb
@@ -1,18 +0,0 @@ | @@ -1,18 +0,0 @@ | ||
1 | -# encoding: utf-8 | ||
2 | - | ||
3 | -HTML::WhiteListSanitizer.module_eval do | ||
4 | - | ||
5 | - #unescape html comments | ||
6 | - def sanitize_with_filter_fixes(*args, &block) | ||
7 | - text = sanitize_without_filter_fixes(*args, &block) | ||
8 | - if text | ||
9 | - final_text = text.gsub(/<!/, '<!') | ||
10 | - final_text = final_text.gsub(/<!--.*\[if IE\]-->(.*)<!--\[endif\]-->/, '<!–-[if IE]>\1<![endif]-–>') #FIX for itheora comments | ||
11 | - | ||
12 | - final_text = final_text.gsub(/&quot;/, '"') #FIX problems with archive.org | ||
13 | - final_text | ||
14 | - end | ||
15 | - end | ||
16 | - alias_method_chain :sanitize, :filter_fixes | ||
17 | - | ||
18 | -end |