diff options
author | Stan Hu <stanhu@gmail.com> | 2015-05-13 21:03:27 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2015-05-13 21:03:27 -0700 |
commit | 28797d3adccea0c2b203bf8d227dd20accdab231 (patch) | |
tree | c9a9e18d074a184e75f654d076c410d30fd6814d | |
parent | cc0a4b7ee896a1d0ca1b0d50d6d4f9f9b480e3d0 (diff) | |
download | gitlab-ce-28797d3adccea0c2b203bf8d227dd20accdab231.tar.gz |
Fix broken view when viewing history of a file that includes a path that used to be another file
Closes #1598
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | 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) @@ -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) |