Commit b27705ce4b11d4ba83393b8eb7eb1e2c55588647
Exists in
spb-stable
and in
2 other branches
Merge branch 'bump-grit' into 'master'
Bump grit Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/222
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
Gemfile.lock
@@ -164,7 +164,7 @@ GEM | @@ -164,7 +164,7 @@ GEM | ||
164 | multi_json | 164 | multi_json |
165 | gitlab-grack (2.0.0.pre) | 165 | gitlab-grack (2.0.0.pre) |
166 | rack (~> 1.5.1) | 166 | rack (~> 1.5.1) |
167 | - gitlab-grit (2.6.7) | 167 | + gitlab-grit (2.6.8) |
168 | charlock_holmes (~> 0.6) | 168 | charlock_holmes (~> 0.6) |
169 | diff-lcs (~> 1.1) | 169 | diff-lcs (~> 1.1) |
170 | mime-types (~> 1.15) | 170 | mime-types (~> 1.15) |