diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-09-12 22:21:22 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-09-12 22:21:22 +0000 |
| commit | f92e8d224c195b6b296252dd30235bb3e7c18beb (patch) | |
| tree | a10a63bc73fe0c4d0a07af55b3ca48d2ce1c13f6 | |
| parent | e21c12375a1c636f58b1630c6906f702dbd56830 (diff) | |
| parent | 4cf04399ea80f84b85d4f301af0c07c2bb161604 (diff) | |
| download | gitlab-ce-f92e8d224c195b6b296252dd30235bb3e7c18beb.tar.gz | |
Merge branch '37730-image-onion-skin-does-not-work-anymore' into 'master'
Resolve "Image onion skin + swipe does not work anymore"
Closes #37730 and #37732
See merge request !14215
| -rw-r--r-- | app/views/projects/diffs/viewers/_image.html.haml | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/37730-image-onion-skin-does-not-work-anymore.yml | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app/views/projects/diffs/viewers/_image.html.haml b/app/views/projects/diffs/viewers/_image.html.haml index aa004a739d7..01879556894 100644 --- a/app/views/projects/diffs/viewers/_image.html.haml +++ b/app/views/projects/diffs/viewers/_image.html.haml @@ -41,10 +41,10 @@ .swipe.view.hide .swipe-frame .frame.deleted - = image_tag(old_blob_raw_path, alt: diff_file.old_path) + = image_tag(old_blob_raw_path, alt: diff_file.old_path, lazy: false) .swipe-wrap .frame.added - = image_tag(blob_raw_path, alt: diff_file.new_path) + = image_tag(blob_raw_path, alt: diff_file.new_path, lazy: false) %span.swipe-bar %span.top-handle %span.bottom-handle @@ -52,9 +52,9 @@ .onion-skin.view.hide .onion-skin-frame .frame.deleted - = image_tag(old_blob_raw_path, alt: diff_file.old_path) + = image_tag(old_blob_raw_path, alt: diff_file.old_path, lazy: false) .frame.added - = image_tag(blob_raw_path, alt: diff_file.new_path) + = image_tag(blob_raw_path, alt: diff_file.new_path, lazy: false) .controls .transparent .drag-track diff --git a/changelogs/unreleased/37730-image-onion-skin-does-not-work-anymore.yml b/changelogs/unreleased/37730-image-onion-skin-does-not-work-anymore.yml new file mode 100644 index 00000000000..7357c61b5f2 --- /dev/null +++ b/changelogs/unreleased/37730-image-onion-skin-does-not-work-anymore.yml @@ -0,0 +1,5 @@ +--- +title: Resolve Image onion skin + swipe does not work anymore +merge_request: +author: +type: fixed |