Download as
Browse Code »

Commit edb090f0e31de49ade0791638aab6e1e770e1b4e

Authored by Braulio Bhavamitra
1 parent a1dad6ba
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails4: update to rails 4.2

Showing 3 changed files with 6 additions and 25 deletions   Show diff stats
Gemfile
  Diff comments   View file @edb090f
1 1 source "https://rubygems.org"
2   -gem 'rails', '~> 4.1.6'
  2 +gem 'rails', '~> 4.2.0'
3 3 gem 'minitest'
4 4 gem 'fast_gettext', '~> 0.6.8'
5 5 gem 'acts-as-taggable-on', '~> 3.4.2'
6 6 gem 'rails_autolink', '~> 1.1.5'
7   -gem 'pg', '~> 0.13.2'
  7 +gem 'pg', '~> 0.18.1'
8 8 gem 'rmagick', '~> 2.13.1'
9 9 gem 'RedCloth', '~> 4.2.9'
10 10 gem 'ruby-feedparser', '~> 0.7'
11 11 gem 'daemons', '~> 1.1.5'
12 12 gem 'thin', '~> 1.3.1'
13   -gem 'nokogiri', '~> 1.5.5'
  13 +gem 'nokogiri', '~> 1.6.0'
14 14 gem 'will_paginate'
15 15 gem 'pothoven-attachment_fu'
16 16 gem 'delayed_job'
... ... @@ -21,7 +21,7 @@ gem 'exception_notification', '~> 4.0.1'
21 21 gem 'gettext', '~> 2.2.1', :require => false
22 22 gem 'locale', '~> 2.0.5'
23 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 26 # asset pipeline
27 27 gem 'uglifier', '>= 1.0.3'
... ...
vendor/plugins/monkey_patches/init.rb
  Diff comments   View file @edb090f
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
View file @a1dad6b
... ... @@ -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(/&lt;!/, '<!')
10   - final_text = final_text.gsub(/<!--.*\[if IE\]-->(.*)<!--\[endif\]-->/, '<!–-[if IE]>\1<![endif]-–>') #FIX for itheora comments
11   -
12   - final_text = final_text.gsub(/&amp;quot;/, '&quot;') #FIX problems with archive.org
13   - final_text
14   - end
15   - end
16   - alias_method_chain :sanitize, :filter_fixes
17   -
18   -end