diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-10-01 19:47:42 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-10-01 19:47:42 +0000 |
| commit | 7bc48f7b1f16290c29de7a822dfd07fda7079e6e (patch) | |
| tree | 3d4e0206d1fe09e329063efefdb1e0d9c0f4d575 | |
| parent | b72cf6f2a205e02597a9cfb0fb8271b497dc5fdc (diff) | |
| parent | b7629a53272bbd4bcd2fe4f98a6c2a7e28534089 (diff) | |
| download | gitlab-ce-7bc48f7b1f16290c29de7a822dfd07fda7079e6e.tar.gz | |
Merge branch 'update-gitlab-git' into 'master'
Update gitlab_git to 7.2.17
Fixes #2316.
See merge request !1464
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -47,7 +47,7 @@ gem "browser", '~> 1.0.0' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 7.2.15' +gem "gitlab_git", '~> 7.2.17' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes diff --git a/Gemfile.lock b/Gemfile.lock index 4386c6b9abb..6472221bc54 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -278,7 +278,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.1) gemojione (~> 2.0) - gitlab_git (7.2.15) + gitlab_git (7.2.17) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -834,7 +834,7 @@ DEPENDENCIES gitlab-flowdock-git-hook (~> 1.0.1) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) - gitlab_git (~> 7.2.15) + gitlab_git (~> 7.2.17) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.0.2) @@ -937,3 +937,6 @@ DEPENDENCIES webmock (~> 1.21.0) whenever (~> 0.8.4) wikicloth (= 0.8.1) + +BUNDLED WITH + 1.10.6 |