summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-05-25 22:15:57 +0000
committerRobert Speicher <robert@gitlab.com>2017-05-25 22:15:57 +0000
commit8e2fefc6c44fc3c6140e5cbc4b56c58c90dc07f3 (patch)
tree2fe8ce678f1183fe778454dfa39e3dcc277d3fd8 /app/assets/javascripts
parente20eb71203aa29458d7f51a27d42a3d8208e2494 (diff)
parentd88a5c1db1c6cca639039188a26c6e6d5bc68831 (diff)
downloadgitlab-ce-8e2fefc6c44fc3c6140e5cbc4b56c58c90dc07f3.tar.gz
Merge branch 'dm-diff-cleanup' into 'master'
Clean up diff rendering See merge request !11390
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/single_file_diff.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/single_file_diff.js b/app/assets/javascripts/single_file_diff.js
index bacb26734c9..c44892dae3d 100644
--- a/app/assets/javascripts/single_file_diff.js
+++ b/app/assets/javascripts/single_file_diff.js
@@ -4,7 +4,7 @@
window.SingleFileDiff = (function() {
var COLLAPSED_HTML, ERROR_HTML, LOADING_HTML, WRAPPER;
- WRAPPER = '<div class="diff-content diff-wrap-lines"></div>';
+ WRAPPER = '<div class="diff-content"></div>';
LOADING_HTML = '<i class="fa fa-spinner fa-spin"></i>';