Use official Grit 2.5.0

Gemfile

@@ -22,7 +22,7 @@ gem 'omniauth-twitter'
 gem 'omniauth-github'
 
 # GITLAB patched libs
-gem "grit",          :git => "https://github.com/gitlabhq/grit.git",            :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
+gem "grit",          '2.5.0'
 gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git",   :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e"
 gem 'yaml_db',       :git => "https://github.com/gitlabhq/yaml_db.git"
 gem 'grack',         :git => "https://github.com/gitlabhq/grack.git"

Gemfile.lock

@@ -12,16 +12,6 @@ GIT
       rack (~> 1.4.1)
 
 GIT
-  remote: https://github.com/gitlabhq/grit.git
-  revision: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
-  ref: 7f35cb98ff17d534a07e3ce6ec3d580f67402837
-  specs:
-    grit (2.5.0)
-      diff-lcs (~> 1.1)
-      mime-types (~> 1.15)
-      posix-spawn (~> 0.3.6)
-
-GIT
   remote: https://github.com/gitlabhq/omniauth-ldap.git
   revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
   ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
@@ -157,6 +147,10 @@ GEM
       rack
       rack-mount
     gratr19 (0.4.4.1)
+    grit (2.5.0)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3.6)
     growl (1.0.3)
     guard (1.3.2)
       listen (>= 0.4.2)
@@ -421,7 +415,7 @@ DEPENDENCIES
   gitolite (= 1.1.0)
   grack!
   grape (~> 0.2.1)
-  grit!
+  grit (= 2.5.0)
   growl
   guard-rspec
   guard-spinach