diff options
| author | Douwe Maan <me@douwe.me> | 2015-05-21 09:55:31 +0200 |
|---|---|---|
| committer | Douwe Maan <me@douwe.me> | 2015-05-21 09:55:31 +0200 |
| commit | 206455a74b90eb075779c24666d66c2f30503e49 (patch) | |
| tree | aeef2ecf187a4622c7a4a22cd5a259f232be76a4 | |
| parent | 2b725777fe00cea0937d43d4d726c74dca766246 (diff) | |
| parent | 5b44a54239284f9f0129ca229f4528a1c71f4193 (diff) | |
| download | gitlab-ce-206455a74b90eb075779c24666d66c2f30503e49.tar.gz | |
Merge pull request #9316 from jvanbaarsen/gitlab-git-update
Updated the gitlab_git gem
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 5 insertions, 5 deletions
@@ -44,7 +44,7 @@ gem "browser" # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '~> 7.1.12' +gem "gitlab_git", '~> 7.1.13' # Ruby/Rack Git Smart-HTTP Server Handler gem 'gitlab-grack', '~> 2.0.2', require: 'grack' diff --git a/Gemfile.lock b/Gemfile.lock index b6cf03b0fd4..586036923f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -225,11 +225,11 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.0) gemojione (~> 2.0) - gitlab_git (7.1.12) + gitlab_git (7.1.13) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) - rugged (~> 0.21.2) + rugged (~> 0.22.2) gitlab_meta (7.0) gitlab_omniauth-ldap (1.2.1) net-ldap (~> 0.9) @@ -530,7 +530,7 @@ GEM sexp_processor (~> 4.1) rubyntlm (0.5.0) rubypants (0.2.0) - rugged (0.21.4) + rugged (0.22.2) rugments (1.0.0.beta6) safe_yaml (0.9.7) sanitize (2.1.0) @@ -723,7 +723,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) - gitlab_git (~> 7.1.12) + gitlab_git (~> 7.1.13) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) |