Merge branch 'fix/deleted_file' into 'master'

Fix deleted file representation with new gitlab_git gem Added this MR as per request from https://github.com/gitlabhq/gitlabhq/pull/7980 * Add new gitlab_gem as per gitlab-org/gitlab_git!6 * Fix the showing of deleted file, as it only displays the named of the file, rather than specifying what had happened **Before** ![Screen Shot 2014-12-30 at 21.02.55](https://gitlab.com/uploads/arif-ali/gitlab-ce/67ec88b06d/Screen_Shot_2014-12-30_at_21.02.55.png) **After** ![Screen Shot 2014-12-30 at 21.05.18](https://gitlab.com/uploads/arif-ali/gitlab-ce/050b689c82/Screen_Shot_2014-12-30_at_21.05.18.png) See merge request !273

Merge branch 'fix/deleted_file' into 'master'
9b3ab90a · Dmitriy Zaporozhets · 1ce14dd7 · 1d8dcfaf · 9b3ab90a · 9b3ab90a
Commit 9b3ab90a authored Jan 05, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

CHANGELOG CHANGELOG +1 -0

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

_file.html.haml app/views/projects/diffs/_file.html.haml +1 -1

No files found.
--- 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

--- 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'

--- 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)

--- 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?