diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-13 17:34:44 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-13 17:34:44 +0000 |
| commit | 4803675190833cdf7e83558a32b2f2ea3283dce0 (patch) | |
| tree | 086c0d64ea117389223110daf54030e6be65eb60 | |
| parent | 309f588d563d581aaf13739c4e97f6c349afbaf4 (diff) | |
| parent | b09e8c771c19953cbebbce5b546d0d92ba9d623e (diff) | |
| download | gitlab-ce-4803675190833cdf7e83558a32b2f2ea3283dce0.tar.gz | |
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
| -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.1.0' +gem "gitlab_git", '~> 7.1.0' # 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 c847424a7c4..b331c29f7ef 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) |