Merge branch 'bump-grit' into 'master'

Bump grit

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/222
This commit is contained in:
Dmitriy Zaporozhets
2014-06-11 16:10:56 +00:00
+1 -1
View File
@@ -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)