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

CHANGELOG

 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)

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'

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)