diff options
| author | Sytse Sijbrandij <sytses@gmail.com> | 2014-10-02 10:53:43 +0200 |
|---|---|---|
| committer | Sytse Sijbrandij <sytses@gmail.com> | 2014-10-02 10:53:43 +0200 |
| commit | cd9a31c2f95bf991869256c42c5b43102eb0e07b (patch) | |
| tree | 0331fd266b773b0e359cba7e78a4d9859062a55a | |
| parent | 5b68a9adafec4a85832c81754760b3149e3e2235 (diff) | |
| parent | 0eb27eada4ee6538b172cbf20278d3b2bbee4cf8 (diff) | |
| download | gitlab-ce-cd9a31c2f95bf991869256c42c5b43102eb0e07b.tar.gz | |
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 3 insertions, 5 deletions
@@ -31,7 +31,7 @@ gem 'omniauth-shibboleth' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '7.0.0.rc7' +gem "gitlab_git", '7.0.0.rc8' # 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 d90ff63f805..d0f29258ffa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,11 +179,10 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (7.0.0.rc7) + gitlab_git (7.0.0.rc8) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) - rubyzip (~> 1.1) rugged (~> 0.21.0) gitlab_meta (7.0) gitlab_omniauth-ldap (1.1.0) @@ -446,7 +445,6 @@ GEM ruby-progressbar (1.2.0) rubyntlm (0.1.1) rubypants (0.2.0) - rubyzip (1.1.6) rugged (0.21.0) safe_yaml (0.9.7) sanitize (2.1.0) @@ -624,7 +622,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc7) + gitlab_git (= 7.0.0.rc8) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.1.0) gollum-lib (~> 3.0.0) |