From 4610c3120f010d75521db4d5ae71b4375a5e9a88 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 5 Mar 2015 21:53:53 +0000 Subject: [PATCH] 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 Conflicts: Gemfile Gemfile.lock --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index c3d8299e94..372cc25251 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ gem "browser" # Extracting information from a git repository # Provide access to Gitlab::Git library -gem "gitlab_git", '7.0.0.rc14' +gem "gitlab_git", '7.0.1' # 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 3283da40f8..0e26a13a8f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -192,7 +192,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.0.1.1) emoji (~> 1.0.1) - gitlab_git (7.0.0.rc14) + gitlab_git (7.0.1) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) @@ -674,7 +674,7 @@ DEPENDENCIES gitlab-grack (~> 2.0.0.pre) gitlab-linguist (~> 3.0.0) gitlab_emoji (~> 0.0.1.1) - gitlab_git (= 7.0.0.rc14) + gitlab_git (= 7.0.1) gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.0) gollum-lib (~> 4.0.0)