summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-08-07 13:14:57 +0200
committerTim Zallmann <tzallmann@gitlab.com>2018-08-08 10:46:17 +0200
commit7558a36e1f726edd8287b71adb770afd7c97f636 (patch)
tree64df4153e214bfb446bb63644191144908f7b977
parent3e9965f767a4bef594e2e589e1cf3af8a68b9107 (diff)
downloadgitlab-ce-7558a36e1f726edd8287b71adb770afd7c97f636.tar.gz
Fix for displaying loading when collapsed
-rw-r--r--app/assets/javascripts/diffs/components/diff_file.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue
index 716ebad209f..eca9fc70490 100644
--- a/app/assets/javascripts/diffs/components/diff_file.vue
+++ b/app/assets/javascripts/diffs/components/diff_file.vue
@@ -126,7 +126,7 @@ export default {
:diff-file="file"
/>
<loading-icon
- v-if="isLoadingCollapsedDiff || !file.renderIt"
+ v-if="isLoadingCollapsedDiff || (!file.renderIt && !isCollapsed)"
class="diff-content loading"
/>
<div