diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-29 18:09:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-29 18:09:12 +0300 |
commit | 4dfd78cb55b08ab20124187d1aab6a431da3e302 (patch) | |
tree | a14b0086833e11b88bc023455b7c1bc8d8dbc5f4 /app/assets/javascripts/single_file_diff.js | |
parent | 5a7d44a955572b912d13ba8949e976f61b5c7f1b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/single_file_diff.js')
-rw-r--r-- | app/assets/javascripts/single_file_diff.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/single_file_diff.js b/app/assets/javascripts/single_file_diff.js index 5fa6cef7195..3492f19c996 100644 --- a/app/assets/javascripts/single_file_diff.js +++ b/app/assets/javascripts/single_file_diff.js @@ -7,11 +7,14 @@ import { deprecatedCreateFlash as createFlash } from './flash'; import FilesCommentButton from './files_comment_button'; import initImageDiffHelper from './image_diff/helpers/init_image_diff'; import syntaxHighlight from './syntax_highlight'; +import { spriteIcon } from '~/lib/utils/common_utils'; const WRAPPER = '<div class="diff-content"></div>'; const LOADING_HTML = '<span class="spinner"></span>'; -const ERROR_HTML = - '<div class="nothing-here-block"><i class="fa fa-warning"></i> Could not load diff</div>'; +const ERROR_HTML = `<div class="nothing-here-block">${spriteIcon( + 'warning-solid', + 's16', +)} Could not load diff</div>`; const COLLAPSED_HTML = '<div class="nothing-here-block diff-collapsed">This diff is collapsed. <button class="click-to-expand btn btn-link">Click to expand it.</button></div>'; |