Merge branch 'gitlab-grit-2.6.11' into 'master'

Update gitlab-grit to 2.6.11 See merge request !1081

Merge branch 'gitlab-grit-2.6.11' into 'master'
Update gitlab-grit to 2.6.11 See merge request !1081
e1bd883c · Dmitriy Zaporozhets · ffb6d27a · ae098742 · e1bd883c
Commit e1bd883c authored Sep 10, 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.10)
+    gitlab-grit (2.6.11)
      charlock_holmes (~> 0.6)
      diff-lcs (~> 1.1)
      mime-types (~> 1.15)