Merge branch 'bump-grit' into 'master'

Bump grit Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/222

Merge branch 'bump-grit' into 'master'
Bump grit Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/222
Dmitriy Zaporozhets
2 parents d1f3643c f2db4a18
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
Gemfile.lock
@@ -164,7 +164,7 @@ GEM
       multi_json
     gitlab-grack (2.0.0.pre)
       rack (~> 1.5.1)
-    gitlab-grit (2.6.7)
+    gitlab-grit (2.6.8)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)