diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-05 21:53:53 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-05 21:53:53 +0000 |
| commit | 06ad715e4cc962c799ba9fba5ef37a91a2e214f5 (patch) | |
| tree | 5418e8a13c15381dc5ee578998f62f1d79504cbf | |
| parent | baae329172b4d0fd07a6a82d10949395d479d318 (diff) | |
| parent | c17e11ca27882c0a35e23eba72689f2fdb89680a (diff) | |
| download | gitlab-ce-06ad715e4cc962c799ba9fba5ef37a91a2e214f5.tar.gz | |
Merge branch 'bump_gitlab_git' into 'master'
Bump gitlab_git to fix 500 with annotated tags w/o message
Should fix https://gitlab.com/gitlab-org/gitlab-ce/issues/1181
See merge request !1640
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -39,7 +39,7 @@ gem "browser" # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '7.0.0.rc15' +gem "gitlab_git", '7.0.1' # Ruby/Rack Git Smart-HTTP Server Handler gem 'gitlab-grack', '~> 2.0.0.rc2', require: 'grack' diff --git a/Gemfile.lock b/Gemfile.lock index 659ed4832bc..cca8f59ac28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -213,7 +213,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (7.0.0.rc15) + gitlab_git (7.0.1) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -708,7 +708,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.rc2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc15) + gitlab_git (= 7.0.1) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.0) gollum-lib (~> 4.0.0) |