Commit b27705ce authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'bump-grit' into 'master'

Bump grit

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/222
parents d1f3643c f2db4a18
...@@ -164,7 +164,7 @@ GEM ...@@ -164,7 +164,7 @@ GEM
multi_json multi_json
gitlab-grack (2.0.0.pre) gitlab-grack (2.0.0.pre)
rack (~> 1.5.1) rack (~> 1.5.1)
gitlab-grit (2.6.7) gitlab-grit (2.6.8)
charlock_holmes (~> 0.6) charlock_holmes (~> 0.6)
diff-lcs (~> 1.1) diff-lcs (~> 1.1)
mime-types (~> 1.15) mime-types (~> 1.15)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment