diff --git a/Gemfile b/Gemfile index eac94e8df..4c5058c7c 100644 --- a/Gemfile +++ b/Gemfile @@ -75,6 +75,8 @@ gem 'soundmanager-rails' gem 'time_diff' +gem 'iconv', '~> 1.0.4' + group :assets do gem 'sass-rails', '~> 3.2.5' gem 'coffee-rails', '~> 3.2.2' diff --git a/Gemfile.lock b/Gemfile.lock index 56e77de54..323d19c51 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -165,6 +165,7 @@ GEM hirb (0.7.1) httpauth (0.2.0) i18n (0.6.9) + iconv (1.0.4) jbuilder (1.4.2) activesupport (>= 3.0.0) multi_json (>= 1.2.0) @@ -471,6 +472,7 @@ DEPENDENCIES haml-rails (~> 0.3.4) highline (~> 1.6.11) hirb + iconv (~> 1.0.4) jbuilder (~> 1.4.2) jquery-rails (~> 2.0.2) js-routes diff --git a/lib/modules/models/git.rb b/lib/modules/models/git.rb index a756519ca..e3ce7b349 100644 --- a/lib/modules/models/git.rb +++ b/lib/modules/models/git.rb @@ -1,6 +1,5 @@ require 'nokogiri' require 'open-uri' -require 'iconv' module Modules module Models