summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorngentile <ngentile@arbor.net>2015-07-22 09:58:17 -0400
committerngentile <ngentile@arbor.net>2015-07-22 09:58:17 -0400
commitdbff6bc106c679edbd135a69ba74532fabe1e996 (patch)
treea3c0c56f937b72d6b238d7557de44edaaf70bb69 /app
parent39dc39e33529ac3632e5d5a6fa06bf6908fb4fa4 (diff)
downloadgitlab-ce-dbff6bc106c679edbd135a69ba74532fabe1e996.tar.gz
Gitlab Issue 707: Indent unfolded code 1 character
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/diff.js.coffee4
-rw-r--r--app/views/projects/blob/diff.html.haml2
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/diff.js.coffee b/app/assets/javascripts/diff.js.coffee
index 069f91c30e1..6d9b364cb8d 100644
--- a/app/assets/javascripts/diff.js.coffee
+++ b/app/assets/javascripts/diff.js.coffee
@@ -31,6 +31,10 @@ class @Diff
bottom: unfoldBottom
offset: offset
unfold: unfold
+ # indent is used to compensate for single space indent to fit
+ # '+' and '-' prepended to diff lines,
+ # see https://gitlab.com/gitlab-org/gitlab-ce/issues/707
+ indent: 1
$.get(link, params, (response) =>
target.parent().replaceWith(response)
diff --git a/app/views/projects/blob/diff.html.haml b/app/views/projects/blob/diff.html.haml
index 84742608986..f3b01ff3288 100644
--- a/app/views/projects/blob/diff.html.haml
+++ b/app/views/projects/blob/diff.html.haml
@@ -11,7 +11,7 @@
%td.old_line.diff-line-num{data: {linenumber: line_old}}
= link_to raw(line_old), "#"
%td.new_line= link_to raw(line_new) , "#"
- %td.line_content.noteable_line= line
+ %td.line_content.noteable_line= ' ' * @form.indent + line
- if @form.unfold? && @form.bottom? && @form.to < @blob.loc
%tr.line_holder{ id: @form.to }