From 28797d3adccea0c2b203bf8d227dd20accdab231 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 13 May 2015 21:03:27 -0700 Subject: Fix broken view when viewing history of a file that includes a path that used to be another file Closes #1598 --- CHANGELOG | 1 + Gemfile | 2 +- Gemfile.lock | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index f059345a5a3..d322dff8f5c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.11.0 (unreleased) + - Fix broken view when viewing history of a file that includes a path that used to be another file (Stan Hu) - Don't show duplicate deploy keys - Fix commit time being displayed in the wrong timezone in some cases (Hannes Rosenögger) - Make the first branch pushed to an empty repository the default HEAD (Stan Hu) diff --git a/Gemfile b/Gemfile index c5d7089750e..7016f1c614d 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' diff --git a/Gemfile.lock b/Gemfile.lock index 9940ab15242..3e1ae4e6d1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -225,7 +225,7 @@ GEM mime-types (~> 1.19) gitlab_emoji (0.1.0) gemojione (~> 2.0) - gitlab_git (7.1.11) + gitlab_git (7.1.12) activesupport (~> 4.0) charlock_holmes (~> 0.6) gitlab-linguist (~> 3.0) -- cgit v1.2.1