diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-05-14 17:47:23 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-05-14 17:47:23 +0000 |
| commit | 37bc4bb19934c4a0eb84fd5e2556363f55d4d601 (patch) | |
| tree | dd6357b920d4a48693720da8bfb6a0fc066f091e | |
| parent | 8dde52cc099af63e1bdc02ca6fc389e4a9ea9969 (diff) | |
| parent | 28797d3adccea0c2b203bf8d227dd20accdab231 (diff) | |
| download | gitlab-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
| -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 dd69d73d86f..5b0934fb0cd 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 ef7487ae5bc..ce1c8cf513d 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) |