diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-04-13 09:16:06 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-04-13 09:50:35 +0100 |
| commit | a236b5e6a22cf762354a9bb3460e6bad80ab5b3f (patch) | |
| tree | 5892871692ff57eed2ef6ceb4a60af7167ea8cab /app/views/discussions | |
| parent | b01fd7ad81524b5f2773ccba4b5789a6074ffb9d (diff) | |
| download | gitlab-ce-a236b5e6a22cf762354a9bb3460e6bad80ab5b3f.tar.gz | |
Render only one error message per diff
Move html to haml file instead of JS
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_diff_with_notes.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/discussions/_diff_with_notes.html.haml b/app/views/discussions/_diff_with_notes.html.haml index b382bc201b5..c13a128835a 100644 --- a/app/views/discussions/_diff_with_notes.html.haml +++ b/app/views/discussions/_diff_with_notes.html.haml @@ -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.line_content.js-error-lazy-load-diff.hidden + - button = button_tag(_("Try again"), class: "btn-link btn-no-padding js-toggle-lazy-diff") + = _("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' |