{{template "org/header" .}}
@@ -7,37 +7,28 @@
{{template "base/alert" .}}
- {{.locale.Tr "repo.settings.secrets"}}
+ {{.locale.Tr "secrets.secrets"}}
- {{.locale.Tr "repo.settings.secrets"}}
+ {{.locale.Tr "secrets.secrets"}}
-
+
-
diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl
index f8c54bf7f6..9f4104bec5 100644
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -11,6 +11,9 @@
{{.locale.Tr "repo.release.tags"}}
{{end}}
+ {{if .EnableFeed}}
+ {{svg "octicon-rss" 18}}
+ {{end}}
{{if (and .CanCreateRelease (not .PageIsTagList))}}
{{.locale.Tr "repo.release.new_release"}}
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl
index 31d1c1f7ab..32a1258b3a 100644
--- a/templates/repo/settings/deploy_keys.tmpl
+++ b/templates/repo/settings/deploy_keys.tmpl
@@ -51,7 +51,7 @@
{{range .Deploykeys}}
-
-
@@ -85,10 +72,10 @@
{{svg "octicon-trash" 16 "mr-2"}}
- {{.locale.Tr "repo.settings.secret_deletion"}}
+ {{.locale.Tr "secrets.deletion"}}
-
{{template "base/delete_modal_actions" .}}
{{.locale.Tr "repo.settings.secret_deletion_desc"}}
+{{.locale.Tr "secrets.deletion.description"}}
-
@@ -79,7 +79,7 @@
{{template "repo/settings/secrets" .}}
+
diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl
index 2327e48392..848a98c594 100644
--- a/templates/repo/settings/navbar.tmpl
+++ b/templates/repo/settings/navbar.tmpl
@@ -25,7 +25,7 @@
{{end}}
- {{.locale.Tr "repo.settings.deploy_keys"}}
+ {{.locale.Tr "secrets.secrets"}}
{{if .LFSStartServer}}
diff --git a/templates/repo/settings/secrets.tmpl b/templates/repo/settings/secrets.tmpl
index 1facd7ba0a..5eb917a83b 100644
--- a/templates/repo/settings/secrets.tmpl
+++ b/templates/repo/settings/secrets.tmpl
@@ -1,69 +1,80 @@
{{svg "octicon-trash"}}
{{.locale.Tr "repo.settings.deploy_key_deletion"}}
diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl
index 5cd1d86f78..3c00c5e188 100644
--- a/templates/repo/settings/nav.tmpl
+++ b/templates/repo/settings/nav.tmpl
@@ -12,7 +12,7 @@
{{if or .SignedUser.AllowGitHook .SignedUser.IsAdmin}}
{{.locale.Tr "repo.settings.githooks"}}
{{end}}
- {{.locale.Tr "repo.settings.secrets"}}
+ {{.locale.Tr "secrets.secrets"}}
-
- {{.locale.Tr "repo.settings.secrets"}}
-
-
- {{.locale.Tr "repo.settings.secrets"}}
-
-
-
-
-
-
-
-
- {{if .Secrets}}
-
- {{range .Secrets}}
-
+ {{.locale.Tr "secrets.secrets"}}
+
+
+
+
-
- {{end}}
+
-
-
-
- {{svg "octicon-key" 32}}
-
-
- {{.Name}}
-
-
-
-
+ {{.locale.Tr "secrets.secrets"}}
+
+
+
+
+
+
+
+
+
+ {{if .Secrets}}
+
+ {{range .Secrets}}
+
+ {{else}}
+ {{.locale.Tr "secrets.none"}}
+ {{end}}
+
+
+ {{end}}
+
+
+
+
+ {{svg "octicon-key" 32}}
+
+
+ {{.Name}}
+
+
+
+
+
diff --git a/tests/integration/api_team_test.go b/tests/integration/api_team_test.go
index 46207203bc..f54c286fc9 100644
--- a/tests/integration/api_team_test.go
+++ b/tests/integration/api_team_test.go
@@ -24,7 +24,7 @@ import (
func TestAPITeam(t *testing.T) {
defer tests.PrepareTestEnv(t)()
- teamUser := unittest.AssertExistsAndLoadBean(t, &organization.TeamUser{})
+ teamUser := unittest.AssertExistsAndLoadBean(t, &organization.TeamUser{ID: 1})
team := unittest.AssertExistsAndLoadBean(t, &organization.Team{ID: teamUser.TeamID})
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: teamUser.UID})
diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go
index d5fbb393b5..3537409aeb 100644
--- a/tests/integration/integration_test.go
+++ b/tests/integration/integration_test.go
@@ -264,18 +264,45 @@ var tokenCounter int64
func getTokenForLoggedInUser(t testing.TB, session *TestSession) string {
t.Helper()
+ var token string
req := NewRequest(t, "GET", "/user/settings/applications")
resp := session.MakeRequest(t, req, http.StatusOK)
- doc := NewHTMLParser(t, resp.Body)
+ var csrf string
+ for _, cookie := range resp.Result().Cookies() {
+ if cookie.Name != "_csrf" {
+ continue
+ }
+ csrf = cookie.Value
+ break
+ }
+ if csrf == "" {
+ doc := NewHTMLParser(t, resp.Body)
+ csrf = doc.GetCSRF()
+ }
+ assert.NotEmpty(t, csrf)
req = NewRequestWithValues(t, "POST", "/user/settings/applications", map[string]string{
- "_csrf": doc.GetCSRF(),
+ "_csrf": csrf,
"name": fmt.Sprintf("api-testing-token-%d", atomic.AddInt64(&tokenCounter, 1)),
})
- session.MakeRequest(t, req, http.StatusSeeOther)
+ resp = session.MakeRequest(t, req, http.StatusSeeOther)
+
+ // Log the flash values on failure
+ if !assert.Equal(t, resp.Result().Header["Location"], []string{"/user/settings/applications"}) {
+ for _, cookie := range resp.Result().Cookies() {
+ if cookie.Name != "macaron_flash" {
+ continue
+ }
+ flash, _ := url.ParseQuery(cookie.Value)
+ for key, value := range flash {
+ t.Logf("Flash %q: %q", key, value)
+ }
+ }
+ }
+
req = NewRequest(t, "GET", "/user/settings/applications")
resp = session.MakeRequest(t, req, http.StatusOK)
htmlDoc := NewHTMLParser(t, resp.Body)
- token := htmlDoc.doc.Find(".ui.info p").Text()
+ token = htmlDoc.doc.Find(".ui.info p").Text()
assert.NotEmpty(t, token)
return token
}
diff --git a/vitest.config.js b/vitest.config.js
index 838360970f..37ebfa5722 100644
--- a/vitest.config.js
+++ b/vitest.config.js
@@ -1,7 +1,7 @@
import {defineConfig} from 'vitest/dist/config.js';
-import {readFile} from 'fs/promises';
+import {readFile} from 'node:fs/promises';
import {dataToEsm} from '@rollup/pluginutils';
-import {extname} from 'path';
+import {extname} from 'node:path';
function stringPlugin() {
return {
diff --git a/web_src/js/components/ActivityHeatmap.vue b/web_src/js/components/ActivityHeatmap.vue
index df7e0beb00..6cd72a8bf7 100644
--- a/web_src/js/components/ActivityHeatmap.vue
+++ b/web_src/js/components/ActivityHeatmap.vue
@@ -32,6 +32,7 @@ export default {
},
data: () => ({
colorRange: [
+ 'var(--color-secondary-alpha-70)',
'var(--color-secondary-alpha-70)',
'var(--color-primary-light-4)',
'var(--color-primary-light-2)',
@@ -50,6 +51,12 @@ export default {
return s;
}
},
+ mounted() {
+ // work around issue with first legend color being rendered twice and legend cut off
+ const legend = document.querySelector('.vch__external-legend-wrapper');
+ legend.setAttribute('viewBox', '12 0 80 10');
+ legend.style.marginRight = '-12px';
+ },
methods: {
handleDayClick(e) {
// Reset filter if same date is clicked
diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js
index 9777e6c8ec..b5a720c9d7 100644
--- a/web_src/js/features/repo-projects.js
+++ b/web_src/js/features/repo-projects.js
@@ -49,6 +49,8 @@ async function initRepoProjectSortable() {
filter: '[data-id="0"]',
animation: 150,
ghostClass: 'card-ghost',
+ delayOnTouchOnly: true,
+ delay: 500,
onSort: () => {
boardColumns = mainBoard.getElementsByClassName('board-column');
for (let i = 0; i < boardColumns.length; i++) {
@@ -76,6 +78,8 @@ async function initRepoProjectSortable() {
ghostClass: 'card-ghost',
onAdd: moveIssue,
onUpdate: moveIssue,
+ delayOnTouchOnly: true,
+ delay: 500,
});
}
}
@@ -200,7 +204,7 @@ function getRelativeColor(color) {
}
function rgbToHex(rgb) {
- rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
+ rgb = rgb.match(/^rgba?\((\d+),\s*(\d+),\s*(\d+).*\)$/);
return `#${hex(rgb[1])}${hex(rgb[2])}${hex(rgb[3])}`;
}
diff --git a/webpack.config.js b/webpack.config.js
index cdd8071d27..e5e592052e 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -6,10 +6,10 @@ import MiniCssExtractPlugin from 'mini-css-extract-plugin';
import MonacoWebpackPlugin from 'monaco-editor-webpack-plugin';
import {VueLoaderPlugin} from 'vue-loader';
import EsBuildLoader from 'esbuild-loader';
-import {parse, dirname} from 'path';
+import {parse, dirname} from 'node:path';
import webpack from 'webpack';
-import {fileURLToPath} from 'url';
-import {readFileSync} from 'fs';
+import {fileURLToPath} from 'node:url';
+import {readFileSync} from 'node:fs';
const {ESBuildMinifyPlugin} = EsBuildLoader;
const {SourceMapDevToolPlugin} = webpack;
+ {{svg "octicon-trash"}}
+ {{.locale.Tr "secrets.deletion"}}
+
+
+
+ {{.locale.Tr "secrets.deletion.description"}}
+
+
+
+