diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-11-14 14:47:08 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2014-11-14 14:47:08 +0000 |
| commit | 66f0c279714b35215ca4db17742e25bb69079d77 (patch) | |
| tree | 91d5afede0e2619ebaa4c8fa1f617fd10bc10ced | |
| parent | e53f9b4d694d492fc318adae8fea1906f832523e (diff) | |
| parent | a9dc2c202938863896ca2de55dc301c655285b93 (diff) | |
| download | gitlab-ce-66f0c279714b35215ca4db17742e25bb69079d77.tar.gz | |
Merge branch 'update-gitlab-git' into 'master'
Update gitlab_git to 7.0.0.rc11
See merge request !1256
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 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.rc10' +gem "gitlab_git", '7.0.0.rc11' # 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 c283d4384fc..a3645f7bbec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,7 +179,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (7.0.0.rc10) + gitlab_git (7.0.0.rc11) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -625,7 +625,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc10) + gitlab_git (= 7.0.0.rc11) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.0) gollum-lib (~> 3.0.0) |