Merge branch 'main' into prevent-npe-when-migrating-if-reviewer-nil

Author: zeripath

templates/user/settings/applications.tmpl

@@ -55,12 +55,6 @@
 </div>
 
 <div class="ui small basic delete modal" id="delete-token">
-	{{/*
-		The wording here is a bit confusing.
-		The action asks for deleting an access token.
-		Confirming is therefore the destructive option and
-		should be deemphasized because it cannot be undone.
-	*/}}
 	<div class="ui icon header">
 		{{svg "octicon-trash"}}
 		{{.i18n.Tr "settings.access_token_deletion"}}

web_src/js/features/imagediff.js

@@ -67,7 +67,8 @@ export default function initImageDiff() {
   $('.image-diff').each(function() {
     const $container = $(this);
 
-    const diffContainerWidth = $container.width() - 300;
+    // the container may be hidden by "viewed" checkbox, so use the parent's width for reference
+    const diffContainerWidth = Math.max($container.closest('.diff-file-box').width() - 300, 100);
     const pathAfter = $container.data('path-after');
     const pathBefore = $container.data('path-before');