diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-11 16:10:56 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-11 16:10:56 +0000 |
| commit | b27705ce4b11d4ba83393b8eb7eb1e2c55588647 (patch) | |
| tree | a3d4658e408396245972be1275186a820f8658f5 /Gemfile.lock | |
| parent | d1f3643cbcf35034be71842733d8fe0937474139 (diff) | |
| parent | f2db4a18b96f5e0918dad3ba3cf3744779fc7036 (diff) | |
| download | gitlab-ce-b27705ce4b11d4ba83393b8eb7eb1e2c55588647.tar.gz | |
Merge branch 'bump-grit' into 'master'
Bump grit
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/222
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 9e4dd359651..013804b999d 100644 --- 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) |