summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-11-17 22:45:00 +0100
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-03 22:51:56 +0100
commit4d2278e7c64548137e1cfb9e4e56f842f15c29cb (patch)
tree6d4025ad04dd6e6831b837fd9545bbbc0b211539 /app
parent6d5c29dc2b08531fd82550e2e9e814382f58bb78 (diff)
downloadgitlab-ce-4d2278e7c64548137e1cfb9e4e56f842f15c29cb.tar.gz
Rename commits/text_file partial to text_diff
Diffstat (limited to 'app')
-rw-r--r--app/views/commits/_diffs.html.haml4
-rw-r--r--app/views/commits/_text_diff.html.haml (renamed from app/views/commits/_text_file.html.haml)0
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/commits/_diffs.html.haml b/app/views/commits/_diffs.html.haml
index e7733f0506b..7fe45aa25bc 100644
--- a/app/views/commits/_diffs.html.haml
+++ b/app/views/commits/_diffs.html.haml
@@ -38,10 +38,10 @@
%br/
.diff_file_content
- -# Skipp all non non-supported blobs
+ -# Skip all non-supported blobs
- next unless file.respond_to?('text?')
- if file.text?
- = render "commits/text_file", diff: diff, index: i
+ = render "commits/text_diff", diff: diff, index: i
- elsif file.image?
- old_file = (@commit.prev_commit.tree / diff.old_path) if !@commit.prev_commit.nil?
- if diff.renamed_file || diff.new_file || diff.deleted_file
diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_diff.html.haml
index 3d9014c3a3f..3d9014c3a3f 100644
--- a/app/views/commits/_text_file.html.haml
+++ b/app/views/commits/_text_diff.html.haml