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:
authorRuben Davila <rdavila84@gmail.com>2016-09-09 18:39:22 +0300
committerRuben Davila <rdavila84@gmail.com>2016-09-09 18:39:22 +0300
commit2cad277d74b6a7367ac11b94652a6efc18eda850 (patch)
treec3720b686e5d556f46d1c09f9b30b073966d7c48 /app/assets/javascripts/diff.js
parente36534dbd2045df23d12627f15c64f6dc523149b (diff)
parent2b3a1da6f3ceb4c78c055f14dfe93dbe818366d3 (diff)
Merge branch 'master' into 8-12-stable
Diffstat (limited to 'app/assets/javascripts/diff.js')
-rw-r--r--app/assets/javascripts/diff.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/diff.js b/app/assets/javascripts/diff.js
index 3dd7ceba92f..c8634b78f2b 100644
--- a/app/assets/javascripts/diff.js
+++ b/app/assets/javascripts/diff.js
@@ -39,6 +39,9 @@
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,
view: file.data('view')
};