add grit_ext to gemfile

2 files changed, 10 insertions, 5 deletions

diff --git a/Gemfile b/Gemfile
index ff16abad3b4..cff7d661330 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,6 +27,7 @@ gem "grit",          git: "https://github.com/gitlabhq/grit.git",           ref:
 gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git",  ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e'
 gem 'yaml_db',       git: "https://github.com/gitlabhq/yaml_db.git",        ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd'
 gem 'grack',         git: "https://github.com/gitlabhq/grack.git",          ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
+gem 'grit_ext',      git: "https://github.com/SaitoWu/grit_ext.git"
 
 # Gitolite client (for work with gitolite-admin repo)
 gem "gitolite", '1.1.0'
@@ -83,9 +84,6 @@ gem 'resque_mailer'
 # HTTP requests
 gem "httparty"
 
-# Handle encodings
-gem "charlock_holmes"
-
 # Colored output to console
 gem "colored"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 7b21a629fc2..a8e4095d23c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,11 @@
 GIT
+  remote: https://github.com/SaitoWu/grit_ext.git
+  revision: 8558b3282696c50813eaba4100ab6f5fec0ebc16
+  specs:
+    grit_ext (0.5.0)
+      charlock_holmes (~> 0.6.9)
+
+GIT
   remote: https://github.com/ctran/annotate_models.git
   revision: 18cd39ad01829deba5aa34634b8540d6675ab978
   specs:
@@ -92,7 +99,7 @@ GEM
     carrierwave (0.6.2)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
-    charlock_holmes (0.6.8)
+    charlock_holmes (0.6.9)
     childprocess (0.3.2)
       ffi (~> 1.0.6)
     chosen-rails (0.9.8.3)
@@ -415,7 +422,6 @@ DEPENDENCIES
   capybara
   capybara-webkit
   carrierwave
-  charlock_holmes
   chosen-rails
   coffee-rails (= 3.2.2)
   colored
@@ -436,6 +442,7 @@ DEPENDENCIES
   grack!
   grape (~> 0.2.1)
   grit!
+  grit_ext!
   growl
   guard-rspec
   guard-spinach