diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-05 19:20:09 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-05 19:20:09 +0000 |
| commit | 4c132ed48e5ddc81bb28bd07e92024ab3bf4d86e (patch) | |
| tree | 4636587aaa0d91ec454e799b5f24fd7ffd433dcf | |
| parent | d02e129a549190c3bd26ed32eac13dfa62f2844d (diff) | |
| parent | 1445f4211e54e6f9fed1a79573d1b39c168b1083 (diff) | |
| download | gitlab-ce-4c132ed48e5ddc81bb28bd07e92024ab3bf4d86e.tar.gz | |
Merge branch 'gitlab_git_5-7' into 'master'
Update gitlab_git to 5.7
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -32,7 +32,7 @@ gem 'omniauth-github' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 5.6.0' +gem "gitlab_git", '~> 5.7.0' # Ruby/Rack Git Smart-HTTP Server Handler gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' diff --git a/Gemfile.lock b/Gemfile.lock index 0b0e2aa7360..0cffe1ab3fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -181,7 +181,7 @@ GEM charlock_holmes (~> 0.6.6) escape_utils (~> 0.2.4) mime-types (~> 1.19) - gitlab_git (5.6.0) + gitlab_git (5.7.0) activesupport (~> 4.0.0) charlock_holmes (~> 0.6.9) gitlab-grit (~> 2.6.1) @@ -590,7 +590,7 @@ DEPENDENCIES gitlab-gollum-lib (~> 1.1.0) gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) - gitlab_git (~> 5.6.0) + gitlab_git (~> 5.7.0) gitlab_meta (= 6.0) gitlab_omniauth-ldap (= 1.0.4) gon (~> 5.0.0) |