From 152c6018b3ace729095e7b58f5be3963b81050fb Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 4 Mar 2013 08:56:54 +0200
Subject: [PATCH] use grit_ext gem instead of fork

---
 Gemfile      |  3 +--
 Gemfile.lock | 12 +++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 70a6c076..cf1617c3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,12 +23,11 @@ gem 'omniauth-github'
 
 # Extracting information from a git repository
 gem "gitlab-grit", '~> 1.0.0', require: 'grit'
+gem 'grit_ext', '~> 0.6.2'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
 
-gem 'grit_ext',      git: "https://github.com/gitlabhq/grit_ext.git",       ref: '2d1b2f13cabc02520405985fccb2a0abfcba9907'
-
 # LDAP Auth
 gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 51940606..89882492 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,14 +6,6 @@ GIT
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
 
-GIT
-  remote: https://github.com/gitlabhq/grit_ext.git
-  revision: 2d1b2f13cabc02520405985fccb2a0abfcba9907
-  ref: 2d1b2f13cabc02520405985fccb2a0abfcba9907
-  specs:
-    grit_ext (0.6.2)
-      charlock_holmes (~> 0.6.9)
-
 GIT
   remote: https://github.com/gitlabhq/raphael-rails.git
   revision: cb2c92a040b9b941a5f1aa1ea866cc26e944fe58
@@ -178,6 +170,8 @@ GEM
     grape-entity (0.2.0)
       activesupport
       multi_json (>= 1.3.2)
+    grit_ext (0.6.2)
+      charlock_holmes (~> 0.6.9)
     growl (1.0.3)
     guard (1.5.4)
       listen (>= 0.4.2)
@@ -480,7 +474,7 @@ DEPENDENCIES
   gon
   grape (~> 0.3.1)
   grape-entity (~> 0.2.0)
-  grit_ext!
+  grit_ext (~> 0.6.2)
   growl
   guard-rspec
   guard-spinach