Use gitlab-grit from githubomnibus

2 files changed, 13 insertions, 5 deletions

diff --git a/Gemfile b/Gemfile
index 5c2d4c253bb..dd017e0544b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,6 +30,7 @@ gem 'omniauth-github'
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
 gem "gitlab_git", git: 'https://gitlab.com/gitlab-org/gitlab_git.git'
+gem "gitlab-grit", git: 'https://github.com/gitlabhq/grit.git', ref: 'bd7672e710d0fdfdd6af551247d102b4e66dc093'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
diff --git a/Gemfile.lock b/Gemfile.lock
index fe0fa951632..c2f500ef5f0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,15 @@
 GIT
+  remote: https://github.com/gitlabhq/grit.git
+  revision: bd7672e710d0fdfdd6af551247d102b4e66dc093
+  ref: bd7672e710d0fdfdd6af551247d102b4e66dc093
+  specs:
+    gitlab-grit (2.6.3)
+      charlock_holmes (~> 0.6.9)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3.6)
+
+GIT
   remote: https://github.com/gitlabhq/markup.git
   revision: 61ade389c1e1c159359338f570d18464a44ddbc4
   ref: 61ade389c1e1c159359338f570d18464a44ddbc4
@@ -177,11 +188,6 @@ GEM
       stringex (~> 1.5.1)
     gitlab-grack (2.0.0.pre)
       rack (~> 1.5.1)
-    gitlab-grit (2.6.3)
-      charlock_holmes (~> 0.6.9)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
     gitlab-linguist (3.0.0)
       charlock_holmes (~> 0.6.6)
       escape_utils (~> 0.2.4)
@@ -580,6 +586,7 @@ DEPENDENCIES
   gitlab-flowdock-git-hook (~> 0.4.2)
   gitlab-gollum-lib (~> 1.1.0)
   gitlab-grack (~> 2.0.0.pre)
+  gitlab-grit!
   gitlab-linguist (~> 3.0.0)
   gitlab_git!
   gitlab_meta (= 6.0)