2 files changed, 35 insertions, 32 deletions
diff --git a/Gemfile b/Gemfile
index 9ef2f2a16d1..df904460132 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,55 +1,56 @@
-source 'http://rubygems.org'
+source "http://rubygems.org"
 
-gem 'rails', '3.1.1'
+gem "rails", "3.1.1"
 
-gem 'sqlite3'
-gem 'devise', "1.5.0"
-gem 'stamp'
-gem 'kaminari'
-gem 'haml-rails'
-gem 'jquery-rails'
-gem 'grit', :git => 'https://github.com/gitlabhq/grit.git'
+gem "sqlite3"
+gem "devise", "1.5.0"
+gem "stamp"
+gem "kaminari"
+gem "haml-rails"
+gem "jquery-rails"
+gem "grit", :git => "https://github.com/gitlabhq/grit.git"
 gem "carrierwave"
-gem 'six'
-gem 'therubyracer'
-gem 'faker'
-gem 'seed-fu', '~> 2.1.0'
+gem "six"
+gem "therubyracer"
+gem "faker"
+gem "seed-fu", "~> 2.1.0"
 gem "inifile"
 gem "pygments.rb", "0.2.3"
 gem "thin"
 gem "git"
 gem "acts_as_list"
-gem 'rdiscount'
-gem 'acts-as-taggable-on', '~> 2.1.0'
-gem 'drapper'
+gem "rdiscount"
+gem "acts-as-taggable-on", "~> 2.1.0"
+gem "drapper"
+gem "rchardet19", "~> 1.3.5"
 
 group :assets do
-  gem 'sass-rails',   "~> 3.1.0"
-  gem 'coffee-rails', "~> 3.1.0"
-  gem 'uglifier'
+  gem "sass-rails",   "~> 3.1.0"
+  gem "coffee-rails", "~> 3.1.0"
+  gem "uglifier"
 end
 
 group :development do
-  gem 'letter_opener'
-  gem 'rails-footnotes', '~> 3.7.5'
-  gem 'annotate', :git => 'https://github.com/ctran/annotate_models.git'
+  gem "letter_opener"
+  gem "rails-footnotes", "~> 3.7.5"
+  gem "annotate", :git => "https://github.com/ctran/annotate_models.git"
 end
 
 group :development, :test do
-  gem 'rspec-rails'
-  gem 'capybara'
-  gem 'autotest'
-  gem 'autotest-rails'
+  gem "rspec-rails"
+  gem "capybara"
+  gem "autotest"
+  gem "autotest-rails"
   unless ENV["CI"]
-    gem 'ruby-debug19', :require => 'ruby-debug'
+    gem "ruby-debug19", :require => "ruby-debug"
   end
-  gem 'awesome_print'
-  gem 'database_cleaner'
-  gem 'launchy'
+  gem "awesome_print"
+  gem "database_cleaner"
+  gem "launchy"
 end
 
 group :test do
-  gem 'turn', :require => false
-  gem 'simplecov', :require => false
+  gem "turn", :require => false
+  gem "simplecov", :require => false
   gem "shoulda", "~> 3.0.0.beta2"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 2ff90cd4bf3..c975a956984 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -157,6 +157,7 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
+    rchardet19 (1.3.5)
     rdiscount (1.6.8)
     rdoc (3.11)
       json (~> 1.4)
@@ -268,6 +269,7 @@ DEPENDENCIES
   pygments.rb (= 0.2.3)
   rails (= 3.1.1)
   rails-footnotes (~> 3.7.5)
+  rchardet19 (~> 1.3.5)
   rdiscount
   rspec-rails
   ruby-debug19