Remove grit fork reference from Gemfile. Use gitlab-gollum-lib gem

1 files changed, 4 insertions, 6 deletions

diff --git a/Gemfile b/Gemfile
index 677577012cd..787a3813f81 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,9 +22,7 @@ gem 'omniauth-twitter'
 gem 'omniauth-github'
 
 # Extracting information from a git repository
-# We cannot use original git since some bugs
-gem "grit", '~> 2.5.0', git: 'https://github.com/gitlabhq/grit.git'
-gem 'gitlab_git', '~> 1.1.0'
+gem 'gitlab_git', '~> 1.2.0'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 1.0.0', require: 'grack'
@@ -35,6 +33,9 @@ gem 'gitlab_omniauth-ldap', '1.0.2', require: "omniauth-ldap"
 # Syntax highlighter
 gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb'
 
+# Git Wiki
+gem "gitlab-gollum-lib", "~> 1.0.0", require: 'gollum-lib'
+
 # Language detection
 gem "github-linguist", require: "linguist"
 
@@ -93,9 +94,6 @@ gem "colored"
 # GitLab settings
 gem 'settingslogic'
 
-# Git Wiki
-gem "gollum-lib", "~> 1.0.0"
-
 # Misc
 gem "foreman"