Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-07-25 00:39:04 +0300
committerStan Hu <stanhu@gmail.com>2015-07-25 00:39:04 +0300
commit71a8c780fff67a4d29c19cb43dc6d002d72ecbc1 (patch)
treea3be3d6b52ce1c0a6abca822c48125c3859998b5 /app/assets
parentbbbcc9657f60960fadae2d9bbd1a11b3a5319e1f (diff)
parentd51ebb7e86bf294e3dd7be94d3c7ec94613a6120 (diff)
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/diff.js.coffee4
1 files changed, 4 insertions, 0 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)