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
b27705ce · Dmitriy Zaporozhets · d1f3643c · f2db4a18 · b27705ce
Commit b27705ce authored Jun 11, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile.lock
+++ b/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)