Merge branch 'bump-grit' into 'master'

Bump grit Fixes gitlab/grit#7 See merge request !1166

Merge branch 'bump-grit' into 'master'
Bump grit Fixes gitlab/grit#7 See merge request !1166
2bfc2f80 · Dmitriy Zaporozhets · 2fb99c79 · d567dd33 · 2bfc2f80
Commit 2bfc2f80 authored Oct 09, 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
@@ -168,7 +168,7 @@ GEM
      multi_json
    gitlab-grack (2.0.0.pre)
      rack (~> 1.5.1)
-    gitlab-grit (2.6.11)
+    gitlab-grit (2.6.12)
      charlock_holmes (~> 0.6)
      diff-lcs (~> 1.1)
      mime-types (~> 1.15)