diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-10 14:04:07 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-10 14:04:07 +0000 |
| commit | 39bda5d05e96ff9b2b8a89852b9520e8f262051e (patch) | |
| tree | 2d36f106e5371a629c86319e49c2150812057445 /Gemfile.lock | |
| parent | 151d9fb35fd66a161cf0e1f95d7b0f0448ca8034 (diff) | |
| parent | c5648de230905afd35a1b044a74b6d687eaed994 (diff) | |
| download | gitlab-ce-39bda5d05e96ff9b2b8a89852b9520e8f262051e.tar.gz | |
Merge branch 'disable-autocrlf-for-binary-files' into 'master'
Fix corrupted binary files when using API files endpoint
Closes #2219
See merge request !1123
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 643c513161f..5ba6948cbc1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -271,7 +271,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.0) gemojione (~> 2.0) - gitlab_git (7.2.6) + gitlab_git (7.2.11) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -783,7 +783,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) - gitlab_git (~> 7.2.6) + gitlab_git (~> 7.2.11) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) |