Commit 9b6dde0d authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'release/7-8-3' into '7-8-stable'

Release 7.8.3

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 !1666
parents dbdc1a66 4610c312
......@@ -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'
......
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment