diff --git a/app/models/error_report.rb b/app/models/error_report.rb index 56fb912af87..3930fef16ec 100644 --- a/app/models/error_report.rb +++ b/app/models/error_report.rb @@ -18,8 +18,6 @@ # with this program. If not, see . # -require 'iconv' - class ErrorReport < ActiveRecord::Base belongs_to :user belongs_to :account diff --git a/gems/html_text_helper/html_text_helper.gemspec b/gems/html_text_helper/html_text_helper.gemspec index f0784792ea1..01d6634a5d1 100644 --- a/gems/html_text_helper/html_text_helper.gemspec +++ b/gems/html_text_helper/html_text_helper.gemspec @@ -17,7 +17,6 @@ Gem::Specification.new do |spec| spec.add_dependency 'nokogiri' spec.add_dependency 'sanitize', '~> 2.1.0' spec.add_dependency 'canvas_text_helper' - spec.add_dependency 'iconv', '~> 1.0' spec.add_dependency 'activesupport', ">= 3.2" diff --git a/gems/html_text_helper/lib/html_text_helper.rb b/gems/html_text_helper/lib/html_text_helper.rb index 9bcbb602c38..a12b3b14fe6 100644 --- a/gems/html_text_helper/lib/html_text_helper.rb +++ b/gems/html_text_helper/lib/html_text_helper.rb @@ -33,7 +33,6 @@ require 'nokogiri' require 'cgi' -require 'iconv' require 'active_support/core_ext/module/remove_method' # https://github.com/rails/rails/issues/28918 require 'active_support' require 'active_support/core_ext' diff --git a/gems/incoming_mail_processor/lib/incoming_mail_processor/incoming_message_processor.rb b/gems/incoming_mail_processor/lib/incoming_mail_processor/incoming_message_processor.rb index d76104fc7bb..29e1a7130f7 100644 --- a/gems/incoming_mail_processor/lib/incoming_mail_processor/incoming_message_processor.rb +++ b/gems/incoming_mail_processor/lib/incoming_mail_processor/incoming_message_processor.rb @@ -18,7 +18,6 @@ # with this program. If not, see . # -require 'iconv' require 'mail' module IncomingMailProcessor diff --git a/gems/utf8_cleaner/utf8_cleaner.gemspec b/gems/utf8_cleaner/utf8_cleaner.gemspec index c04e3ac5e3b..617af1eb73f 100644 --- a/gems/utf8_cleaner/utf8_cleaner.gemspec +++ b/gems/utf8_cleaner/utf8_cleaner.gemspec @@ -14,8 +14,6 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib"] - spec.add_dependency 'iconv', '~> 1.0' - spec.add_development_dependency "bundler", "~> 1.5" spec.add_development_dependency "rake" spec.add_development_dependency "rspec", "~> 3.5.0"