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
This commit is contained in:
Dmitriy Zaporozhets 2015-03-05 21:53:53 +00:00
commit 06ad715e4c
2 changed files with 3 additions and 3 deletions

View File

@ -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'

View File

@ -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)