diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/assets/javascripts/image_diff | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
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/image_diff.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/image_diff/replaced_image_diff.js | 2 |
3 files changed, 3 insertions, 3 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/image_diff.js b/app/assets/javascripts/image_diff/image_diff.js index 079f4a63f6e..a0dd8e6f894 100644 --- a/app/assets/javascripts/image_diff/image_diff.js +++ b/app/assets/javascripts/image_diff/image_diff.js @@ -1,7 +1,7 @@ import $ from 'jquery'; +import { isImageLoaded } from '../lib/utils/image_utility'; import imageDiffHelper from './helpers/index'; import ImageBadge from './image_badge'; -import { isImageLoaded } from '../lib/utils/image_utility'; export default class ImageDiff { constructor(el, 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) { |