Commit 4c132ed48e5ddc81bb28bd07e92024ab3bf4d86e
Exists in
spb-stable
and in
3 other branches
Merge branch 'gitlab_git_5-7' into 'master'
Update gitlab_git to 5.7
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
Gemfile
| ... | ... | @@ -32,7 +32,7 @@ gem 'omniauth-github' |
| 32 | 32 | |
| 33 | 33 | # Extracting information from a git repository |
| 34 | 34 | # Provide access to Gitlab::Git library |
| 35 | -gem "gitlab_git", '~> 5.6.0' | |
| 35 | +gem "gitlab_git", '~> 5.7.0' | |
| 36 | 36 | |
| 37 | 37 | # Ruby/Rack Git Smart-HTTP Server Handler |
| 38 | 38 | gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | ... | ... |
Gemfile.lock
| ... | ... | @@ -181,7 +181,7 @@ GEM |
| 181 | 181 | charlock_holmes (~> 0.6.6) |
| 182 | 182 | escape_utils (~> 0.2.4) |
| 183 | 183 | mime-types (~> 1.19) |
| 184 | - gitlab_git (5.6.0) | |
| 184 | + gitlab_git (5.7.0) | |
| 185 | 185 | activesupport (~> 4.0.0) |
| 186 | 186 | charlock_holmes (~> 0.6.9) |
| 187 | 187 | gitlab-grit (~> 2.6.1) |
| ... | ... | @@ -590,7 +590,7 @@ DEPENDENCIES |
| 590 | 590 | gitlab-gollum-lib (~> 1.1.0) |
| 591 | 591 | gitlab-grack (~> 2.0.0.pre) |
| 592 | 592 | gitlab-linguist (~> 3.0.0) |
| 593 | - gitlab_git (~> 5.6.0) | |
| 593 | + gitlab_git (~> 5.7.0) | |
| 594 | 594 | gitlab_meta (= 6.0) |
| 595 | 595 | gitlab_omniauth-ldap (= 1.0.4) |
| 596 | 596 | gon (~> 5.0.0) | ... | ... |