From 366377986c9089f92be77a8c9aed37e29017911c Mon Sep 17 00:00:00 2001 From: GiteaBot Date: Sat, 1 Apr 2023 00:06:55 +0000 Subject: [PATCH 01/36] [skip ci] Updated translations via Crowdin --- options/locale/locale_pt-PT.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini index 498115300a5d..9e5136d01eba 100644 --- a/options/locale/locale_pt-PT.ini +++ b/options/locale/locale_pt-PT.ini @@ -2280,6 +2280,8 @@ diff.image.side_by_side=Lado a Lado diff.image.swipe=Deslizar diff.image.overlay=Sobrepor diff.has_escaped=Esta linha tem caracteres unicode escondidos +diff.show_file_tree=Mostrar árvore de ficheiros +diff.hide_file_tree=Esconder árvore de ficheiros releases.desc=Acompanhe as versões e as descargas do repositório. release.releases=Lançamentos @@ -3364,6 +3366,7 @@ runners.status.idle=Parada runners.status.active=Em funcionamento runners.status.offline=Desconectada runners.version=Versão +runners.reset_registration_token_success=O código de incrição do executor foi reposto com sucesso runs.all_workflows=Todas as sequências de trabalho runs.open_tab=%d abertas From 053df150fe056964771222569d4cb20dba19fd88 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 1 Apr 2023 02:58:36 +0200 Subject: [PATCH 02/36] Make first section on home page full width (#23854) Before: Screenshot 2023-03-31 at 19 56 16 After: Screenshot 2023-03-31 at 20 00 14 --- templates/home.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/home.tmpl b/templates/home.tmpl index cc1026ce9e7d..57f0709a9fe9 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -1,6 +1,6 @@ {{template "base/head" .}}
-
+
From e2165854a6c40a4ce95b81911d06e311217ba028 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 1 Apr 2023 13:47:54 +0800 Subject: [PATCH 03/36] Improve home page template, fix Sort dropdown menu flash (#23856) Follow #23854 Major changes: 1. The old `
` doesn't have affect any more * So clean them, and remove other unnecessary elements/styles. 2. Add padding for narrow view. Before ![image](https://user-images.githubusercontent.com/2114189/229262177-e8cf6c9b-b17b-482c-83fe-a84579e01e8e.png) After: ![image](https://user-images.githubusercontent.com/2114189/229262166-d46134b0-2117-4d5c-a469-a2115cbd4b6c.png) --- templates/home.tmpl | 8 +++----- templates/repo/issue/list.tmpl | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/templates/home.tmpl b/templates/home.tmpl index 57f0709a9fe9..1f10f3c8d2ad 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -1,10 +1,8 @@ {{template "base/head" .}}
-
-
-
- -
+
+
+

{{AppName}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 80d1bec57955..cfc9a930484f 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -182,7 +182,7 @@ {{.locale.Tr "repo.issues.filter_sort"}} {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
+
{{.locale.Tr "repo.issues.filter_sort.latest"}} {{.locale.Tr "repo.issues.filter_sort.oldest"}} {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} From 9a30b2eafac10f68ee374c9b2ee4b020e33b170e Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 1 Apr 2023 13:50:40 +0800 Subject: [PATCH 04/36] Fix review conversation reply (#23846) Regression of #23245 Close #23843 --- templates/repo/diff/comment_form.tmpl | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/repo/diff/comment_form.tmpl b/templates/repo/diff/comment_form.tmpl index 507e4828a76e..394a392bb9b8 100644 --- a/templates/repo/diff/comment_form.tmpl +++ b/templates/repo/diff/comment_form.tmpl @@ -27,6 +27,7 @@ {{if $.reply}} + {{else}} {{if $.root.CurrentReview}} From aa9c9209800e07127065ad296a9d1d4af883ae36 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 1 Apr 2023 20:57:05 +0800 Subject: [PATCH 05/36] Improve action log display with control chars (#23820) Close #23680 Some CLI programs use "\r" and control chars to print new content in current line. So, the strings in one line are actually from `\rReading...1%\rReading...5%\rReading...100%` This PR tries to make the output better. --- package-lock.json | 14 ++++++ package.json | 1 + vitest.config.js | 2 + web_src/js/components/RepoActionView.test.js | 30 ++++++++++++ web_src/js/components/RepoActionView.vue | 48 ++++++++++++++++++-- 5 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 web_src/js/components/RepoActionView.test.js diff --git a/package-lock.json b/package-lock.json index 93adf5622f83..313fa515aeaa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,6 +55,7 @@ "@playwright/test": "1.31.2", "@rollup/pluginutils": "5.0.2", "@stoplight/spectral-cli": "6.6.0", + "@vitejs/plugin-vue": "4.1.0", "eslint": "8.36.0", "eslint-plugin-import": "2.27.5", "eslint-plugin-jquery": "1.5.1", @@ -1609,6 +1610,19 @@ "integrity": "sha512-FDJNkyhmKLw7uEvTxx5tSXfPeQpO0iy73Ry+PmYZJvQy0QIWX8a7kJ4kLWRf+EbTPJEPDSgPXHaM7pzr5lmvCg==", "dev": true }, + "node_modules/@vitejs/plugin-vue": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.1.0.tgz", + "integrity": "sha512-++9JOAFdcXI3lyer9UKUV4rfoQ3T1RN8yDqoCLar86s0xQct5yblxAE+yWgRnU5/0FOlVCpTZpYSBV/bGWrSrQ==", + "dev": true, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "peerDependencies": { + "vite": "^4.0.0", + "vue": "^3.2.25" + } + }, "node_modules/@vitest/expect": { "version": "0.29.3", "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.29.3.tgz", diff --git a/package.json b/package.json index a5d09157a65d..dc781c6a323b 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "@playwright/test": "1.31.2", "@rollup/pluginutils": "5.0.2", "@stoplight/spectral-cli": "6.6.0", + "@vitejs/plugin-vue": "4.1.0", "eslint": "8.36.0", "eslint-plugin-import": "2.27.5", "eslint-plugin-jquery": "1.5.1", diff --git a/vitest.config.js b/vitest.config.js index 37ebfa57222f..0cf2996b6ee8 100644 --- a/vitest.config.js +++ b/vitest.config.js @@ -2,6 +2,7 @@ import {defineConfig} from 'vitest/dist/config.js'; import {readFile} from 'node:fs/promises'; import {dataToEsm} from '@rollup/pluginutils'; import {extname} from 'node:path'; +import vue from '@vitejs/plugin-vue'; function stringPlugin() { return { @@ -28,5 +29,6 @@ export default defineConfig({ }, plugins: [ stringPlugin(), + vue(), ], }); diff --git a/web_src/js/components/RepoActionView.test.js b/web_src/js/components/RepoActionView.test.js new file mode 100644 index 000000000000..011c20d8d193 --- /dev/null +++ b/web_src/js/components/RepoActionView.test.js @@ -0,0 +1,30 @@ +import {expect, test} from 'vitest'; + +import {ansiLogToHTML} from './RepoActionView.vue'; +import AnsiToHTML from 'ansi-to-html'; + +test('processConsoleLine', () => { + expect(ansiLogToHTML('abc')).toEqual('abc'); + expect(ansiLogToHTML('abc\n')).toEqual('abc'); + expect(ansiLogToHTML('abc\r\n')).toEqual('abc'); + expect(ansiLogToHTML('\r')).toEqual(''); + expect(ansiLogToHTML('\rx\rabc')).toEqual('x\nabc'); + expect(ansiLogToHTML('\rabc\rx\r')).toEqual('abc\nx'); + + expect(ansiLogToHTML('\x1b[30mblack\x1b[37mwhite')).toEqual('blackwhite'); + expect(ansiLogToHTML('