diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index cb20fb0c568e2..2ca2fa2bce70f 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -9,6 +9,13 @@
{{if not .Repository.IsArchived}}
{{if or .CanWriteIssues .CanWritePulls}}
+ {{if .Milestone.IsClosed}}
+
{{$.locale.Tr "repo.milestones.open"}}
+
+ {{else}}
+
{{$.locale.Tr "repo.milestones.close"}}
+
+ {{end}}
{{.locale.Tr "repo.milestones.edit"}}
{{end}}
{{.locale.Tr "repo.issues.new"}}
diff --git a/tests/integration/api_packages_container_test.go b/tests/integration/api_packages_container_test.go
index d925fd16470a3..fe9208bb05bee 100644
--- a/tests/integration/api_packages_container_test.go
+++ b/tests/integration/api_packages_container_test.go
@@ -321,7 +321,7 @@ func TestPackageContainer(t *testing.T) {
metadata := pd.Metadata.(*container_module.Metadata)
assert.Equal(t, container_module.TypeOCI, metadata.Type)
assert.Len(t, metadata.ImageLayers, 2)
- assert.Empty(t, metadata.MultiArch)
+ assert.Empty(t, metadata.Manifests)
assert.Len(t, pd.Files, 3)
for _, pfd := range pd.Files {
@@ -462,10 +462,22 @@ func TestPackageContainer(t *testing.T) {
assert.IsType(t, &container_module.Metadata{}, pd.Metadata)
metadata := pd.Metadata.(*container_module.Metadata)
assert.Equal(t, container_module.TypeOCI, metadata.Type)
- assert.Contains(t, metadata.MultiArch, "linux/arm/v7")
- assert.Equal(t, manifestDigest, metadata.MultiArch["linux/arm/v7"])
- assert.Contains(t, metadata.MultiArch, "linux/arm64/v8")
- assert.Equal(t, untaggedManifestDigest, metadata.MultiArch["linux/arm64/v8"])
+ assert.Len(t, metadata.Manifests, 2)
+ assert.Condition(t, func() bool {
+ for _, m := range metadata.Manifests {
+ switch m.Platform {
+ case "linux/arm/v7":
+ assert.Equal(t, manifestDigest, m.Digest)
+ assert.EqualValues(t, 1524, m.Size)
+ case "linux/arm64/v8":
+ assert.Equal(t, untaggedManifestDigest, m.Digest)
+ assert.EqualValues(t, 1514, m.Size)
+ default:
+ return false
+ }
+ }
+ return true
+ })
assert.Len(t, pd.Files, 1)
assert.True(t, pd.Files[0].File.IsLead)
diff --git a/web_src/js/features/clipboard.js b/web_src/js/features/clipboard.js
index 07c439504ed7c..bcbdae27049f0 100644
--- a/web_src/js/features/clipboard.js
+++ b/web_src/js/features/clipboard.js
@@ -1,48 +1,9 @@
import {showTemporaryTooltip} from '../modules/tippy.js';
import {toAbsoluteUrl} from '../utils.js';
+import {clippie} from 'clippie';
const {copy_success, copy_error} = window.config.i18n;
-export async function copyToClipboard(content) {
- if (content instanceof Blob) {
- const item = new ClipboardItem({[content.type]: content});
- await navigator.clipboard.write([item]);
- } else { // text
- try {
- await navigator.clipboard.writeText(content);
- } catch {
- return fallbackCopyToClipboard(content);
- }
- }
- return true;
-}
-
-// Fallback to use if navigator.clipboard doesn't exist. Achieved via creating
-// a temporary textarea element, selecting the text, and using document.execCommand
-function fallbackCopyToClipboard(text) {
- if (!document.execCommand) return false;
-
- const tempTextArea = document.createElement('textarea');
- tempTextArea.value = text;
-
- // avoid scrolling
- tempTextArea.style.top = 0;
- tempTextArea.style.left = 0;
- tempTextArea.style.position = 'fixed';
-
- document.body.appendChild(tempTextArea);
-
- tempTextArea.select();
-
- // if unsecure (not https), there is no navigator.clipboard, but we can still
- // use document.execCommand to copy to clipboard
- const success = document.execCommand('copy');
-
- document.body.removeChild(tempTextArea);
-
- return success;
-}
-
// For all DOM elements with [data-clipboard-target] or [data-clipboard-text],
// this copy-to-clipboard will work for them
export function initGlobalCopyToClipboardListener() {
@@ -61,7 +22,7 @@ export function initGlobalCopyToClipboardListener() {
e.preventDefault();
(async() => {
- const success = await copyToClipboard(text);
+ const success = await clippie(text);
showTemporaryTooltip(target, success ? copy_success : copy_error);
})();
diff --git a/web_src/js/features/copycontent.js b/web_src/js/features/copycontent.js
index 5a4b99ae9b0d1..e51953625d4da 100644
--- a/web_src/js/features/copycontent.js
+++ b/web_src/js/features/copycontent.js
@@ -1,11 +1,11 @@
-import {copyToClipboard} from './clipboard.js';
+import {clippie} from 'clippie';
import {showTemporaryTooltip} from '../modules/tippy.js';
import {convertImage} from '../utils.js';
const {i18n} = window.config;
async function doCopy(content, btn) {
- const success = await copyToClipboard(content);
+ const success = await clippie(content);
showTemporaryTooltip(btn, success ? i18n.copy_success : i18n.copy_error);
}
diff --git a/web_src/js/features/repo-code.js b/web_src/js/features/repo-code.js
index 1c59913132932..c0dced44ebc42 100644
--- a/web_src/js/features/repo-code.js
+++ b/web_src/js/features/repo-code.js
@@ -2,7 +2,7 @@ import $ from 'jquery';
import {svg} from '../svg.js';
import {invertFileFolding} from './file-fold.js';
import {createTippy} from '../modules/tippy.js';
-import {copyToClipboard} from './clipboard.js';
+import {clippie} from 'clippie';
import {toAbsoluteUrl} from '../utils.js';
export const singleAnchorRegex = /^#(L|n)([1-9][0-9]*)$/;
@@ -190,7 +190,7 @@ export function initRepoCodeView() {
currentTarget.closest('tr').outerHTML = blob;
});
$(document).on('click', '.copy-line-permalink', async (e) => {
- const success = await copyToClipboard(toAbsoluteUrl(e.currentTarget.getAttribute('data-url')));
+ const success = await clippie(toAbsoluteUrl(e.currentTarget.getAttribute('data-url')));
if (!success) return;
document.querySelector('.code-line-button')?._tippy?.hide();
});
diff --git a/web_src/js/utils/dom.js b/web_src/js/utils/dom.js
index 80c9f01cf2ebf..c160d37f6ccb7 100644
--- a/web_src/js/utils/dom.js
+++ b/web_src/js/utils/dom.js
@@ -1,23 +1,3 @@
-function getComputedStyleProperty(el, prop) {
- const cs = el ? window.getComputedStyle(el) : null;
- return cs ? cs[prop] : null;
-}
-
-function isShown(el) {
- return getComputedStyleProperty(el, 'display') !== 'none';
-}
-
-function assertShown(el, expectShown) {
- if (window.config.runModeIsProd) return;
-
- // to help developers to catch display bugs, this assertion can be removed after next release cycle or if it has been proved that there is no bug.
- if (expectShown && !isShown(el)) {
- throw new Error('element is hidden but should be shown');
- } else if (!expectShown && isShown(el)) {
- throw new Error('element is shown but should be hidden');
- }
-}
-
function elementsCall(el, func, ...args) {
if (typeof el === 'string' || el instanceof String) {
el = document.querySelectorAll(el);
@@ -41,16 +21,10 @@ function elementsCall(el, func, ...args) {
function toggleShown(el, force) {
if (force === true) {
el.classList.remove('gt-hidden');
- assertShown(el, true);
} else if (force === false) {
el.classList.add('gt-hidden');
- assertShown(el, false);
} else if (force === undefined) {
- const wasShown = window.config.runModeIsProd ? undefined : isShown(el);
el.classList.toggle('gt-hidden');
- if (wasShown !== undefined) {
- assertShown(el, !wasShown);
- }
} else {
throw new Error('invalid force argument');
}