diff options
author | Phil Hughes <me@iamphill.com> | 2018-09-13 14:04:31 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-09-13 14:04:31 +0000 |
commit | c4009e643d3f7297d4eb53477ee7b71e25ac01bd (patch) | |
tree | eb83fa593fe89d6b82cf6b8f7966bc53b3667f73 /app | |
parent | 3784a37086b6fcbc5baf1117c2d506f3c1237f77 (diff) | |
parent | 06025e4a26be528c3def72fb0ae9d68140b20860 (diff) | |
download | gitlab-ce-c4009e643d3f7297d4eb53477ee7b71e25ac01bd.tar.gz |
Merge branch '7573-show-click-to-expand-on-not-rendered-diffs' into 'master'
Display click to expand on collapsed diffs
Closes #51466
See merge request gitlab-org/gitlab-ce!21716
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/diffs/components/diff_file.vue | 2 |
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 940e06a75cc..bcbe374a90c 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -44,7 +44,7 @@ export default { }, showExpandMessage() { return ( - !this.isCollapsed && + this.isCollapsed || !this.file.highlightedDiffLines && !this.isLoadingCollapsedDiff && !this.file.tooLarge && |