Merge branch 'bump-gitlab-git' into 'master'

Bump gitlab_git to 7.1.1

Verify found object is actually a commit in Commit.find.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1204

See merge request !1696
This commit is contained in:
Dmitriy Zaporozhets 2015-03-13 17:34:44 +00:00
commit 4803675190
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.1.0'
gem "gitlab_git", '~> 7.1.0'
# 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.1.0)
gemojione (~> 2.0)
gitlab_git (7.1.0)
gitlab_git (7.1.1)
activesupport (~> 4.0)
charlock_holmes (~> 0.6)
gitlab-linguist (~> 3.0)
@ -709,7 +709,7 @@ DEPENDENCIES
gitlab-grack (~> 2.0.0.rc2)
gitlab-linguist (~> 3.0.1)
gitlab_emoji (~> 0.1)
gitlab_git (= 7.1.0)
gitlab_git (~> 7.1.0)
gitlab_meta (= 7.0)
gitlab_omniauth-ldap (= 1.2.0)
gollum-lib (~> 4.0.0)