summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2018-01-09 14:57:31 +0000
committerSean McGivern <sean@mcgivern.me.uk>2018-01-09 14:57:31 +0000
commit8de1bb9e74a00766c663b1cdf8c7b49ddc060caf (patch)
treed3827f42e4b1bfc16e5a2bdba2844c01466e73a8 /app/views
parent678a00d60a21fcd39fa5c8043fadc4a94e618f4d (diff)
parent500a3de7b4be05b797c9da6c6d535a4edf65db5e (diff)
downloadgitlab-ce-8de1bb9e74a00766c663b1cdf8c7b49ddc060caf.tar.gz
Merge branch 'changes-dropdown-ellipsis' into 'master'
Fix changes dropdown ellipsis working across browsers Closes #41561 and #41684 See merge request gitlab-org/gitlab-ce!16281
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/diffs/_stats.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_stats.html.haml b/app/views/projects/diffs/_stats.html.haml
index dd473ebe580..325159dd9a7 100644
--- a/app/views/projects/diffs/_stats.html.haml
+++ b/app/views/projects/diffs/_stats.html.haml
@@ -25,7 +25,7 @@
= sprite_icon(diff_file_changed_icon(diff_file), size: 16, css_class: "#{diff_file_changed_icon_color(diff_file)} diff-file-changed-icon append-right-8")
%span.diff-changed-file-content.append-right-8
%strong.diff-changed-file-name= diff_file.blob.name
- %span.diff-changed-file-path.prepend-top-5= diff_file.new_path
+ %span.diff-changed-file-path.prepend-top-5= diff_file_path_text(diff_file)
%span.diff-changed-stats
%span.cgreen<
+#{diff_file.added_lines}