diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-17 20:24:25 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-17 20:24:25 +0300 |
| commit | 694b290a2e1f85c62452835edde0a01348096935 (patch) | |
| tree | 63d30919f4b05abc78e21dc223413aee2ee40696 /app/views/discussions | |
| parent | b179af197e96ffb9439e9ffea4301023e1399522 (diff) | |
| parent | 8feab9494b65b2854175cfbcf595a103b36a45ea (diff) | |
[skip ci] Merge branch 'master' into bootstrap4
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_diff_with_notes.html.haml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/views/discussions/_diff_with_notes.html.haml b/app/views/discussions/_diff_with_notes.html.haml index 8680ec2e298..646e89e9bd1 100644 --- a/app/views/discussions/_diff_with_notes.html.haml +++ b/app/views/discussions/_diff_with_notes.html.haml @@ -7,7 +7,7 @@ - unless expanded - diff_data = { lines_path: project_merge_request_discussion_path(discussion.project, discussion.noteable, discussion) } -.diff-file.file-holder{ class: diff_file_class, data: diff_data } +.diff-file.file-holder.js-lazy-load-discussion{ class: diff_file_class, data: diff_data } .js-file-title.file-title.file-title-flex-parent .file-header-content = render "projects/diffs/file_header", diff_file: diff_file, url: discussion_path(discussion), show_toggle: false @@ -28,8 +28,11 @@ %tr.line_holder.line-holder-placeholder %td.old_line.diff-line-num %td.new_line.diff-line-num - %td.line_content + %td.line_content.js-success-lazy-load .js-code-placeholder + %td.js-error-lazy-load-diff.hidden.diff-loading-error-block + - button = button_tag(_("Try again"), class: "btn-link btn-link-retry btn-no-padding js-toggle-lazy-diff-retry-button") + = _("Unable to load the diff. %{button_try_again}").html_safe % { button_try_again: button} = render "discussions/diff_discussion", discussions: [discussion], expanded: true - else - partial = (diff_file.new_file? || diff_file.deleted_file?) ? 'single_image_diff' : 'replaced_image_diff' |