diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-14 11:51:26 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-14 11:51:26 +0000 |
| commit | bbef0ae03bc105234495144d369b87b748fd9ca7 (patch) | |
| tree | 87152707dff9a82634860b322e357da901cf8312 /Gemfile.lock | |
| parent | 2099aa38b661f7ceacb1346c1199b9dd89c7dec0 (diff) | |
| parent | 99e1f4888a2333b36bba8505001e8e267c44523f (diff) | |
| download | gitlab-ce-bbef0ae03bc105234495144d369b87b748fd9ca7.tar.gz | |
Merge branch 'satellite_chdir' into 'master'
Remove thread-unsafe Dir.chdir from Satellite#lock
See merge request !968
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 363987bea12..fe85e9ec9ea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -165,7 +165,7 @@ GEM multi_json gitlab-grack (2.0.0.pre) rack (~> 1.5.1) - gitlab-grit (2.6.9) + gitlab-grit (2.6.10) charlock_holmes (~> 0.6) diff-lcs (~> 1.1) mime-types (~> 1.15) |