diff options
| author | Phil Hughes <me@iamphill.com> | 2018-09-13 17:04:31 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-09-13 19:25:14 +0300 |
| commit | ac03dcb2d552f4e7217a637f94173fa078a96594 (patch) | |
| tree | 774027f8b7c94980e8d982117519f9adaf7f9449 /app | |
| parent | eb84fd4b1de10a4b40b228f51e05bab2d75112ff (diff) | |
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 67e85c4eee3..eb93074e5e5 100644 --- a/app/assets/javascripts/diffs/components/diff_file.vue +++ b/app/assets/javascripts/diffs/components/diff_file.vue @@ -46,7 +46,7 @@ export default { }, showExpandMessage() { return ( - !this.isCollapsed && + this.isCollapsed || !this.file.highlightedDiffLines && !this.isLoadingCollapsedDiff && !this.file.tooLarge && |