diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-10-18 12:13:11 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-10-18 12:13:11 +0000 |
| commit | a28a0c60d51e1d9eeb1b55f8f5c032f1d1fe4b51 (patch) | |
| tree | cddc9bd0a32a077ddbf048fcfd5c8c8f8890bdcd /app | |
| parent | e4b465d746675238f65dea1c98bcf71e8e4b0805 (diff) | |
| download | gitlab-ce-a28a0c60d51e1d9eeb1b55f8f5c032f1d1fe4b51.tar.gz | |
Fix resolved discussions not expanding on side by side view
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/discussions/_parallel_diff_discussion.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/discussions/_parallel_diff_discussion.html.haml b/app/views/discussions/_parallel_diff_discussion.html.haml index 253cd336882..079d9083dff 100644 --- a/app/views/discussions/_parallel_diff_discussion.html.haml +++ b/app/views/discussions/_parallel_diff_discussion.html.haml @@ -4,7 +4,7 @@ %td.notes_line.old %td.notes_content.parallel.old .content{ class: ('hide' unless discussions_left.any?(&:expanded?)) } - = render partial: "discussions/notes", collection: discussions_left, as: :discussion, line_type: 'old' + = render partial: "discussions/notes", collection: discussions_left, as: :discussion, line_type: 'old', locals: { disable_collapse_class: true } - else %td.notes_line.old= ("") %td.notes_content.parallel.old @@ -14,7 +14,7 @@ %td.notes_line.new %td.notes_content.parallel.new .content{ class: ('hide' unless discussions_right.any?(&:expanded?)) } - = render partial: "discussions/notes", collection: discussions_right, as: :discussion, line_type: 'new' + = render partial: "discussions/notes", collection: discussions_right, as: :discussion, line_type: 'new', locals: { disable_collapse_class: true } - else %td.notes_line.new= ("") %td.notes_content.parallel.new |