diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-26 10:33:11 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-26 10:33:11 +0300 |
| commit | 1302dc8f0420dacec65ef1dcc955763c6c263cec (patch) | |
| tree | ae7af388db164611a32d3f096741f924fc2a6826 | |
| parent | fabe282873382cfc40dbab6b23f138cc6c44f250 (diff) | |
| parent | aaaf2bd9531a5ba614a77d05c3945eee328e8e14 (diff) | |
| download | gitlab-ce-1302dc8f0420dacec65ef1dcc955763c6c263cec.tar.gz | |
Merge branch 'bump-gitlab_git'
| -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.rc1' +gem "gitlab_git", '7.0.0.rc2' # 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 564debdc3ad..26b406f7fa1 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.rc1) + gitlab_git (7.0.0.rc2) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -618,7 +618,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc1) + gitlab_git (= 7.0.0.rc2) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.1.0) gollum-lib (~> 3.0.0) |