diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 21:09:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-14 21:09:20 +0300 |
commit | 835f1214dcc4e08e3076f269b7b2aa854ea4257a (patch) | |
tree | 07366d250301a8b2a8d7f24d220f4db21b5f6f59 /app/assets/javascripts/image_diff | |
parent | 8309ef26ed9ae22e3115a0203dfff302812c154a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/image_diff')
-rw-r--r-- | app/assets/javascripts/image_diff/helpers/init_image_diff.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/image_diff/replaced_image_diff.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/image_diff/helpers/init_image_diff.js b/app/assets/javascripts/image_diff/helpers/init_image_diff.js index 8eef930c372..51168b94e6d 100644 --- a/app/assets/javascripts/image_diff/helpers/init_image_diff.js +++ b/app/assets/javascripts/image_diff/helpers/init_image_diff.js @@ -1,6 +1,6 @@ +import ImageFile from '../../commit/image_file'; import ImageDiff from '../image_diff'; import ReplacedImageDiff from '../replaced_image_diff'; -import ImageFile from '../../commit/image_file'; function initImageDiff(fileEl, canCreateNote, renderCommentBadge) { const options = { diff --git a/app/assets/javascripts/image_diff/replaced_image_diff.js b/app/assets/javascripts/image_diff/replaced_image_diff.js index 2df15e5e1a5..a3d9b8a138a 100644 --- a/app/assets/javascripts/image_diff/replaced_image_diff.js +++ b/app/assets/javascripts/image_diff/replaced_image_diff.js @@ -1,6 +1,6 @@ import imageDiffHelper from './helpers/index'; -import { viewTypes, isValidViewType } from './view_types'; import ImageDiff from './image_diff'; +import { viewTypes, isValidViewType } from './view_types'; export default class ReplacedImageDiff extends ImageDiff { init(defaultViewType = viewTypes.TWO_UP) { |