diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-09 17:57:31 +0300 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-01-10 03:20:31 +0300 |
| commit | ea5ab9fe87999fcfb03fc8c5341a5ad3b6c334b9 (patch) | |
| tree | 9994f6f2d4e41dbab7d132f0204f65ce1fa98d5a /app/views | |
| parent | 5bdaeb23bf766e78a0e219d4924b87dd2bc16073 (diff) | |
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
(cherry picked from commit 8de1bb9e74a00766c663b1cdf8c7b49ddc060caf)
500a3de7 Fix changes dropdown ellipsis working across browsers
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/diffs/_stats.html.haml | 2 |
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} |