From 1d8dcfaf8be8679556e1602d0061fc5cdd828845 Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Tue, 30 Dec 2014 20:50:08 +0000
Subject: [PATCH] fix deleted file display when using new gitlab_git gem, and
 add new gitlab_git gem

---
 CHANGELOG                                | 1 +
 Gemfile                                  | 2 +-
 Gemfile.lock                             | 4 ++--
 app/views/projects/diffs/_file.html.haml | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9fafbbba673..c5700524385 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@ v 7.7.0
   - Add alert message in case of outdated browser (IE < 10)
   -
   - Added API support for sorting projects
+  - Update gitlab_git to version 7.0.0.rc13
 
 v 7.6.0
   - Fork repository to groups
diff --git a/Gemfile b/Gemfile
index 29f3df0ea9e..c7078009a5e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,7 @@ gem "browser"
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '7.0.0.rc12'
+gem "gitlab_git", '7.0.0.rc13'
 
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
diff --git a/Gemfile.lock b/Gemfile.lock
index 554223b83c9..55861ae53ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -183,7 +183,7 @@ GEM
       mime-types (~> 1.19)
     gitlab_emoji (0.0.1.1)
       emoji (~> 1.0.1)
-    gitlab_git (7.0.0.rc12)
+    gitlab_git (7.0.0.rc13)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.6)
       gitlab-linguist (~> 3.0)
@@ -643,7 +643,7 @@ DEPENDENCIES
   gitlab-grack (~> 2.0.0.pre)
   gitlab-linguist (~> 3.0.0)
   gitlab_emoji (~> 0.0.1.1)
-  gitlab_git (= 7.0.0.rc12)
+  gitlab_git (= 7.0.0.rc13)
   gitlab_meta (= 7.0)
   gitlab_omniauth-ldap (= 1.2.0)
   gollum-lib (~> 3.0.0)
diff --git a/app/views/projects/diffs/_file.html.haml b/app/views/projects/diffs/_file.html.haml
index 23e7691b32e..0c5f2ad1f3a 100644
--- a/app/views/projects/diffs/_file.html.haml
+++ b/app/views/projects/diffs/_file.html.haml
@@ -4,7 +4,7 @@
 .diff-file{id: "diff-#{i}", data: {blob_diff_path: blob_diff_path }}
   .diff-header{id: "file-path-#{hexdigest(diff_file.new_path || diff_file.old_path)}"}
     - if diff_file.deleted_file
-      %span= diff_file.old_path
+      %span="#{diff_file.old_path} deleted"
 
       .diff-btn-group
         - if @commit.parent_ids.present?