summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-05-14 17:47:23 +0000
committerDouwe Maan <douwe@gitlab.com>2015-05-14 17:47:23 +0000
commit37bc4bb19934c4a0eb84fd5e2556363f55d4d601 (patch)
treedd6357b920d4a48693720da8bfb6a0fc066f091e /Gemfile
parent8dde52cc099af63e1bdc02ca6fc389e4a9ea9969 (diff)
parent28797d3adccea0c2b203bf8d227dd20accdab231 (diff)
downloadgitlab-ce-37bc4bb19934c4a0eb84fd5e2556363f55d4d601.tar.gz
Merge branch 'fix-blob-path' into 'master'
Fix broken view when viewing history of a file that includes a path that used to be another file Requires gitlab_git to v7.1.12 to be tagged and released. Closes #1598 See merge request !651
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index ca110d8732f..84007d4a776 100644
--- a/Gemfile
+++ b/Gemfile
@@ -44,7 +44,7 @@ gem "browser"
# Extracting information from a git repository
# Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 7.1.11'
+gem "gitlab_git", '~> 7.1.12'
# Ruby/Rack Git Smart-HTTP Server Handler
gem 'gitlab-grack', '~> 2.0.2', require: 'grack'