diff --git a/go.mod b/go.mod index 9dc8ae3f5b..73e2d2e7ed 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( code.gitea.io/sdk/gitea v0.17.1 codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570 connectrpc.com/connect v1.16.1 - gitea.com/go-chi/binding v0.0.0-20230415142243-04b515c6d669 + gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed gitea.com/go-chi/cache v0.2.0 gitea.com/go-chi/captcha v0.0.0-20240315150714-fb487f629098 gitea.com/go-chi/session v0.0.0-20240316035857-16768d98ec96 diff --git a/go.sum b/go.sum index a42bce3812..c43731aaac 100644 --- a/go.sum +++ b/go.sum @@ -54,8 +54,8 @@ git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078 h1:cliQ4H git.sr.ht/~mariusor/go-xsd-duration v0.0.0-20220703122237-02e73435a078/go.mod h1:g/V2Hjas6Z1UHUp4yIx6bATpNzJ7DYtD0FG3+xARWxs= gitea.com/gitea/act v0.261.1 h1:iACWLc/k8wct9fCF2WdYKqn2Hxx6NjW9zbOP79HF4H4= gitea.com/gitea/act v0.261.1/go.mod h1:Pg5C9kQY1CEA3QjthjhlrqOC/QOT5NyWNjOjRHw23Ok= -gitea.com/go-chi/binding v0.0.0-20230415142243-04b515c6d669 h1:RUBX+MK/TsDxpHmymaOaydfigEbbzqUnG1OTZU/HAeo= -gitea.com/go-chi/binding v0.0.0-20230415142243-04b515c6d669/go.mod h1:77TZu701zMXWJFvB8gvTbQ92zQ3DQq/H7l5wAEjQRKc= +gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed h1:EZZBtilMLSZNWtHHcgq2mt6NSGhJSZBuduAlinMEmso= +gitea.com/go-chi/binding v0.0.0-20240430071103-39a851e106ed/go.mod h1:E3i3cgB04dDx0v3CytCgRTTn9Z/9x891aet3r456RVw= gitea.com/go-chi/cache v0.2.0 h1:E0npuTfDW6CT1yD8NMDVc1SK6IeRjfmRL2zlEsCEd7w= gitea.com/go-chi/cache v0.2.0/go.mod h1:iQlVK2aKTZ/rE9UcHyz9pQWGvdP9i1eI2spOpzgCrtE= gitea.com/go-chi/captcha v0.0.0-20240315150714-fb487f629098 h1:p2ki+WK0cIeNQuqjR98IP2KZQKRzJJiV7aTeMAFwaWo= @@ -283,7 +283,6 @@ github.com/go-ap/jsonld v0.0.0-20221030091449-f2a191312c73/go.mod h1:jyveZeGw5La github.com/go-asn1-ber/asn1-ber v1.5.5 h1:MNHlNMBDgEKD4TcKr36vQN68BA00aDfjIt3/bD50WnA= github.com/go-asn1-ber/asn1-ber v1.5.5/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= github.com/go-chi/chi/v5 v5.0.1/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= -github.com/go-chi/chi/v5 v5.0.4/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/chi/v5 v5.0.11 h1:BnpYbFZ3T3S1WMpD79r7R5ThWX40TaFB7L31Y8xqSwA= github.com/go-chi/chi/v5 v5.0.11/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8= github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4= @@ -358,7 +357,6 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.2.1/go.mod h1:hRKAFb8wOxFROYNsT1bqfWnhX+b5MFeJM9r2ZSwg/KY= -github.com/goccy/go-json v0.9.5/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.9.6/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= diff --git a/modules/markup/html.go b/modules/markup/html.go index f73221a37f..56f63b8a76 100644 --- a/modules/markup/html.go +++ b/modules/markup/html.go @@ -54,7 +54,7 @@ var ( shortLinkPattern = regexp.MustCompile(`\[\[(.*?)\]\](\w*)`) // anySHA1Pattern splits url containing SHA into parts - anyHashPattern = regexp.MustCompile(`https?://(?:\S+/){4,5}([0-9a-f]{40,64})(/[-+~_%.a-zA-Z0-9/]+)?(\?[-+~_%\.a-zA-Z0-9=&]+)?(#[-+~_%.a-zA-Z0-9]+)?`) + anyHashPattern = regexp.MustCompile(`https?://(?:\S+/){4,5}([0-9a-f]{40,64})(/[-+~_%.a-zA-Z0-9/]+)?(#[-+~_%.a-zA-Z0-9]+)?`) // comparePattern matches "http://domain/org/repo/compare/COMMIT1...COMMIT2#hash" comparePattern = regexp.MustCompile(`https?://(?:\S+/){4,5}([0-9a-f]{7,64})(\.\.\.?)([0-9a-f]{7,64})?(#[-+~_%.a-zA-Z0-9]+)?`) @@ -969,10 +969,10 @@ func fullHashPatternProcessor(ctx *RenderContext, node *html.Node) { subpath = node.Data[m[4]:m[5]] } - // 5th capture group matches a optional url hash + // 4th capture group matches a optional url hash hash := "" - if m[9] > 0 { - hash = node.Data[m[8]:m[9]][1:] + if m[7] > 0 { + hash = node.Data[m[6]:m[7]][1:] } start := m[0] diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go index 917f280c73..e313be7040 100644 --- a/modules/markup/html_internal_test.go +++ b/modules/markup/html_internal_test.go @@ -403,39 +403,28 @@ func TestRegExp_anySHA1Pattern(t *testing.T) { "https://github.com/jquery/jquery/blob/a644101ed04d0beacea864ce805e0c4f86ba1cd1/test/unit/event.js#L2703": { "a644101ed04d0beacea864ce805e0c4f86ba1cd1", "/test/unit/event.js", - "", "#L2703", }, "https://github.com/jquery/jquery/blob/a644101ed04d0beacea864ce805e0c4f86ba1cd1/test/unit/event.js": { "a644101ed04d0beacea864ce805e0c4f86ba1cd1", "/test/unit/event.js", "", - "", }, "https://github.com/jquery/jquery/commit/0705be475092aede1eddae01319ec931fb9c65fc": { "0705be475092aede1eddae01319ec931fb9c65fc", "", "", - "", }, "https://github.com/jquery/jquery/tree/0705be475092aede1eddae01319ec931fb9c65fc/src": { "0705be475092aede1eddae01319ec931fb9c65fc", "/src", "", - "", }, "https://try.gogs.io/gogs/gogs/commit/d8a994ef243349f321568f9e36d5c3f444b99cae#diff-2": { "d8a994ef243349f321568f9e36d5c3f444b99cae", "", - "", "#diff-2", }, - "https://codeberg.org/forgejo/forgejo/src/commit/949ab9a5c4cac742f84ae5a9fa186f8d6eb2cdc0/RELEASE-NOTES.md?display=source&w=1#L7-L9": { - "949ab9a5c4cac742f84ae5a9fa186f8d6eb2cdc0", - "/RELEASE-NOTES.md", - "?display=source&w=1", - "#L7-L9", - }, } for k, v := range testCases { diff --git a/modules/markup/html_test.go b/modules/markup/html_test.go index cfd1a66a18..a1a99c1a7f 100644 --- a/modules/markup/html_test.go +++ b/modules/markup/html_test.go @@ -127,12 +127,6 @@ func TestRender_CrossReferences(t *testing.T) { test( util.URLJoin(markup.TestAppURL, "gogitea", "some-repo-name", "issues", "12345"), `

gogitea/some-repo-name#12345

`) - - sha := "65f1bf27bc3bf70f64657658635e66094edbcb4d" - urlWithQuery := util.URLJoin(markup.TestAppURL, "forgejo", "some-repo-name", "commit", sha, "README.md") + "?display=source#L1-L5" - test( - urlWithQuery, - `

`+sha[:10]+`/README.md (L1-L5)

`) } func TestMisc_IsSameDomain(t *testing.T) { diff --git a/package-lock.json b/package-lock.json index 5781507561..8988034ad6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "chart.js": "4.4.2", "chartjs-adapter-dayjs-4": "1.0.4", "chartjs-plugin-zoom": "2.0.1", - "clippie": "4.1.1", + "clippie": "4.0.7", "css-loader": "7.0.0", "dayjs": "1.11.11", "dropzone": "6.0.0-beta.2", @@ -67,7 +67,7 @@ "@eslint-community/eslint-plugin-eslint-comments": "4.3.0", "@playwright/test": "1.43.0", "@stoplight/spectral-cli": "6.11.1", - "@stylistic/eslint-plugin-js": "1.8.0", + "@stylistic/eslint-plugin-js": "1.7.2", "@stylistic/stylelint-plugin": "2.1.2", "@vitejs/plugin-vue": "5.0.4", "@vue/test-utils": "2.4.5", @@ -87,7 +87,7 @@ "eslint-plugin-vue-scoped-css": "2.8.0", "eslint-plugin-wc": "2.1.0", "happy-dom": "14.7.1", - "markdownlint-cli": "0.40.0", + "markdownlint-cli": "0.39.0", "postcss-html": "1.6.0", "stylelint": "16.4.0", "stylelint-declaration-block-no-ignored-properties": "2.8.0", @@ -95,7 +95,7 @@ "stylelint-value-no-unknown-custom-properties": "6.0.1", "svgo": "3.2.0", "updates": "16.0.1", - "vite-string-plugin": "1.3.1", + "vite-string-plugin": "1.2.0", "vitest": "1.5.3" }, "engines": { @@ -2126,12 +2126,12 @@ } }, "node_modules/@stylistic/eslint-plugin-js": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-1.8.0.tgz", - "integrity": "sha512-jdvnzt+pZPg8TfclZlTZPiUbbima93ylvQ+wNgHLNmup3obY6heQvgewSu9i2CfS61BnRByv+F9fxQLPoNeHag==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-1.7.2.tgz", + "integrity": "sha512-ZYX7C5p7zlHbACwFLU+lISVh6tdcRP/++PWegh2Sy0UgMT5kU0XkPa2tKWEtJYzZmPhJxu9LxbnWcnE/tTwSDQ==", "dev": true, "dependencies": { - "@types/eslint": "^8.56.10", + "@types/eslint": "^8.56.8", "acorn": "^8.11.3", "escape-string-regexp": "^4.0.0", "eslint-visitor-keys": "^3.4.3", @@ -2224,9 +2224,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.56.10", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz", - "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==", + "version": "8.56.9", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.9.tgz", + "integrity": "sha512-W4W3KcqzjJ0sHg2vAq9vfml6OhsJ53TcUjUqfzzZf/EChUtwspszj/S0pzMxnfRcO55/iGq47dscXw71Fxc4Zg==", "dependencies": { "@types/estree": "*", "@types/json-schema": "*" @@ -3779,9 +3779,9 @@ } }, "node_modules/clippie": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/clippie/-/clippie-4.1.1.tgz", - "integrity": "sha512-D9OOW77Kkj9YEiDXTQjZJZLvTjJPEmK2IBx8JbGJIZaqVd8RvSvxwIN4KVSEFQfu9Jh0z5FL6Pdc4SIknllFFA==" + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/clippie/-/clippie-4.0.7.tgz", + "integrity": "sha512-xmIARCRFQUoCR0kNNu4uIv5f/IFqM1fUts0vQwt1hQEdCPEqs3/dTaG38WenlWOgs3Fcn73PBYXbPIVSlOgFRw==" }, "node_modules/cliui": { "version": "7.0.4", @@ -8212,9 +8212,9 @@ } }, "node_modules/markdown-it": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", - "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.0.0.tgz", + "integrity": "sha512-seFjF0FIcPt4P9U39Bq1JYblX0KZCjDLFFQPHpL5AzHpqPEKtosxmdq/LTVZnjfH7tjt9BxStm+wXcDBNuYmzw==", "dev": true, "dependencies": { "argparse": "^2.0.1", @@ -8222,20 +8222,20 @@ "linkify-it": "^5.0.0", "mdurl": "^2.0.0", "punycode.js": "^2.3.1", - "uc.micro": "^2.1.0" + "uc.micro": "^2.0.0" }, "bin": { "markdown-it": "bin/markdown-it.mjs" } }, "node_modules/markdownlint": { - "version": "0.34.0", - "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.34.0.tgz", - "integrity": "sha512-qwGyuyKwjkEMOJ10XN6OTKNOVYvOIi35RNvDLNxTof5s8UmyGHlCdpngRHoRGNvQVGuxO3BJ7uNSgdeX166WXw==", + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/markdownlint/-/markdownlint-0.33.0.tgz", + "integrity": "sha512-4lbtT14A3m0LPX1WS/3d1m7Blg+ZwiLq36WvjQqFGsX3Gik99NV+VXp/PW3n+Q62xyPdbvGOCfjPqjW+/SKMig==", "dev": true, "dependencies": { - "markdown-it": "14.1.0", - "markdownlint-micromark": "0.1.9" + "markdown-it": "14.0.0", + "markdownlint-micromark": "0.1.8" }, "engines": { "node": ">=18" @@ -8245,22 +8245,20 @@ } }, "node_modules/markdownlint-cli": { - "version": "0.40.0", - "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.40.0.tgz", - "integrity": "sha512-JXhI3dRQcaqwiFYpPz6VJ7aKYheD53GmTz9y4D/d0F1MbZDGOp9pqKlbOfUX/pHP/iAoeiE4wYRmk8/kjLakxA==", + "version": "0.39.0", + "resolved": "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.39.0.tgz", + "integrity": "sha512-ZuFN7Xpsbn1Nbp0YYkeLOfXOMOfLQBik2lKRy8pVI/llmKQ2uW7x+8k5OMgF6o7XCsTDSYC/OOmeJ+3qplvnJQ==", "dev": true, "dependencies": { - "commander": "~12.0.0", + "commander": "~11.1.0", "get-stdin": "~9.0.0", - "glob": "~10.3.12", - "ignore": "~5.3.1", + "glob": "~10.3.10", + "ignore": "~5.3.0", "js-yaml": "^4.1.0", "jsonc-parser": "~3.2.1", - "jsonpointer": "5.0.1", - "markdownlint": "~0.34.0", - "minimatch": "~9.0.4", - "run-con": "~1.3.2", - "toml": "~3.0.0" + "markdownlint": "~0.33.0", + "minimatch": "~9.0.3", + "run-con": "~1.3.2" }, "bin": { "markdownlint": "markdownlint.js" @@ -8270,12 +8268,12 @@ } }, "node_modules/markdownlint-cli/node_modules/commander": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-12.0.0.tgz", - "integrity": "sha512-MwVNWlYjDTtOjX5PiD7o5pK0UrFU/OYgcJfjjK4RaHZETNtjJqrZa9Y9ds88+A+f+d5lv+561eZ+yCKoS3gbAA==", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", + "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", "dev": true, "engines": { - "node": ">=18" + "node": ">=16" } }, "node_modules/markdownlint-cli/node_modules/glob": { @@ -8307,12 +8305,12 @@ "dev": true }, "node_modules/markdownlint-micromark": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.9.tgz", - "integrity": "sha512-5hVs/DzAFa8XqYosbEAEg6ok6MF2smDj89ztn9pKkCtdKHVdPQuGMH7frFfYL9mLkvfFe4pTyAMffLbjf3/EyA==", + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/markdownlint-micromark/-/markdownlint-micromark-0.1.8.tgz", + "integrity": "sha512-1ouYkMRo9/6gou9gObuMDnvZM8jC/ly3QCFQyoSPCS2XV1ZClU0xpKbL1Ar3bWWRT1RnBZkWUEiNKrI2CwiBQA==", "dev": true, "engines": { - "node": ">=18" + "node": ">=16" }, "funding": { "url": "https://github.com/sponsors/DavidAnson" @@ -11833,12 +11831,6 @@ "resolved": "https://registry.npmjs.org/toastify-js/-/toastify-js-1.12.0.tgz", "integrity": "sha512-HeMHCO9yLPvP9k0apGSdPUWrUbLnxUKNFzgUoZp1PHCLploIX/4DSQ7V8H25ef+h4iO9n0he7ImfcndnN6nDrQ==" }, - "node_modules/toml": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz", - "integrity": "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==", - "dev": true - }, "node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", @@ -12287,9 +12279,9 @@ } }, "node_modules/vite-string-plugin": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/vite-string-plugin/-/vite-string-plugin-1.3.1.tgz", - "integrity": "sha512-0Wu9yNw4QlSVM4SlwozzxR0geMoKFrAIpMldgPuzDvV8lWT1v+0pFXYt+t48qocYXBaxiuVRE3qcsEwFDHBAmA==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vite-string-plugin/-/vite-string-plugin-1.2.0.tgz", + "integrity": "sha512-IijlLgTxUDUwOpLoBLZCZO2us4fZWPRpj8XWoD9OAYjjUEge8enV4gaDTOs7uEsC8EJ9+NmusdLwmgWajFO45Q==", "dev": true }, "node_modules/vite/node_modules/@types/estree": { diff --git a/package.json b/package.json index b380a33568..2eb9e2da6d 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "chart.js": "4.4.2", "chartjs-adapter-dayjs-4": "1.0.4", "chartjs-plugin-zoom": "2.0.1", - "clippie": "4.1.1", + "clippie": "4.0.7", "css-loader": "7.0.0", "dayjs": "1.11.11", "dropzone": "6.0.0-beta.2", @@ -66,7 +66,7 @@ "@eslint-community/eslint-plugin-eslint-comments": "4.3.0", "@playwright/test": "1.43.0", "@stoplight/spectral-cli": "6.11.1", - "@stylistic/eslint-plugin-js": "1.8.0", + "@stylistic/eslint-plugin-js": "1.7.2", "@stylistic/stylelint-plugin": "2.1.2", "@vitejs/plugin-vue": "5.0.4", "@vue/test-utils": "2.4.5", @@ -86,7 +86,7 @@ "eslint-plugin-vue-scoped-css": "2.8.0", "eslint-plugin-wc": "2.1.0", "happy-dom": "14.7.1", - "markdownlint-cli": "0.40.0", + "markdownlint-cli": "0.39.0", "postcss-html": "1.6.0", "stylelint": "16.4.0", "stylelint-declaration-block-no-ignored-properties": "2.8.0", @@ -94,7 +94,7 @@ "stylelint-value-no-unknown-custom-properties": "6.0.1", "svgo": "3.2.0", "updates": "16.0.1", - "vite-string-plugin": "1.3.1", + "vite-string-plugin": "1.2.0", "vitest": "1.5.3" }, "browserslist": ["defaults"] diff --git a/release-notes/8.0.0/3608.md b/release-notes/8.0.0/3608.md deleted file mode 100644 index 1c3072422a..0000000000 --- a/release-notes/8.0.0/3608.md +++ /dev/null @@ -1 +0,0 @@ -Fix text selection color diff --git a/release-notes/8.0.0/feat/3615.md b/release-notes/8.0.0/feat/3615.md deleted file mode 100644 index f2dd891c95..0000000000 --- a/release-notes/8.0.0/feat/3615.md +++ /dev/null @@ -1,5 +0,0 @@ -Support the [Nix tarball fetcher immutable link protocol](https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md) on archive URLs, so Forgejo-generated tarballs for branches will go into Nix's `flake.lock` as their respective commit URLs and `nix flake update` will just work. This allows natively fetching Forgejo repositories for Nix flake inputs as tarballs rather than as Git repositories, significantly improving fetch times and avoiding depending on Git at runtime. - -Concretely, Forgejo now returns a header of the following format from its archive URLs: `Link: rel="immutable"`. - -Example usage: `inputs.meow.url = "https://my-forgejo/someuser/somerepo/archive/main.tar.gz";` in `flake.nix`. For a private repository, configure `netrc-file` in `nix.conf` and use `https://my-forgejo/api/v1/repos/someuser/somerepo/archive/main.tar.gz` as a URL instead, since the normal archive endpoint doesn't support tokens. diff --git a/renovate.json b/renovate.json index 0a6bf6f700..89025178c3 100644 --- a/renovate.json +++ b/renovate.json @@ -60,9 +60,7 @@ { "description": "Group nodejs packages", "matchDepNames": ["node", "docker.io/node", "docker.io/library/node"], - "groupName": "nodejs packages", - "versionCompatibility": "^(?[^-]+)(?-.*)?$", - "versioning": "node" + "groupName": "nodejs packages" }, { "description": "Automerge renovate updates", @@ -73,12 +71,20 @@ }, { "description": "Split minor and patch updates", - "matchDepNames": ["vue", "github.com/urfave/cli/v2", "swagger-ui-dist"], + "matchDepNames": [ + "vue", + "github.com/urfave/cli/v2", + "swagger-ui-dist" + ], "separateMinorPatch": true }, { "description": "Automerge patch updates", - "matchDepNames": ["vue", "github.com/urfave/cli/v2", "swagger-ui-dist"], + "matchDepNames": [ + "vue", + "github.com/urfave/cli/v2", + "swagger-ui-dist" + ], "matchUpdateTypes": ["patch"], "automerge": true }, @@ -97,7 +103,7 @@ { "description": "Automerge some packages when ci succeeds", "extends": ["packages:linters"], - "matchDepNames": ["vitest", "vite-string-plugin"], + "matchDepNames": ["vitest"], "automerge": true }, { diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go index 34ccc929a5..70eb3fbc25 100644 --- a/routers/api/v1/repo/file.go +++ b/routers/api/v1/repo/file.go @@ -326,12 +326,6 @@ func archiveDownload(ctx *context.APIContext) { func download(ctx *context.APIContext, archiveName string, archiver *repo_model.RepoArchiver) { downloadName := ctx.Repo.Repository.Name + "-" + archiveName - // Add nix format link header so tarballs lock correctly: - // https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md - ctx.Resp.Header().Add("Link", fmt.Sprintf("<%s/archive/%s.tar.gz?rev=%s>; rel=\"immutable\"", - ctx.Repo.Repository.APIURL(), - archiver.CommitID, archiver.CommitID)) - rPath := archiver.RelativePath() if setting.RepoArchive.Storage.MinioConfig.ServeDirect { // If we have a signed url (S3, object storage), redirect to this directly. diff --git a/routers/web/org/setting/blocked_users.go b/routers/web/org/setting/blocked_users.go index 0c7f245c13..b23f5ba596 100644 --- a/routers/web/org/setting/blocked_users.go +++ b/routers/web/org/setting/blocked_users.go @@ -10,7 +10,6 @@ import ( "code.gitea.io/gitea/models/db" user_model "code.gitea.io/gitea/models/user" - shared_user "code.gitea.io/gitea/routers/web/shared/user" "code.gitea.io/gitea/services/context" user_service "code.gitea.io/gitea/services/user" ) @@ -28,12 +27,6 @@ func BlockedUsers(ctx *context.Context) { return } - err = shared_user.LoadHeaderCount(ctx) - if err != nil { - ctx.ServerError("LoadHeaderCount", err) - return - } - ctx.Data["BlockedUsers"] = blockedUsers ctx.HTML(http.StatusOK, tplBlockedUsers) diff --git a/routers/web/repo/issue_dependency.go b/routers/web/repo/issue_dependency.go index 66b38688ec..e3b85ee638 100644 --- a/routers/web/repo/issue_dependency.go +++ b/routers/web/repo/issue_dependency.go @@ -109,7 +109,7 @@ func RemoveDependency(ctx *context.Context) { } // Dependency Type - depTypeStr := ctx.Req.PostFormValue("dependencyType") + depTypeStr := ctx.Req.PostForm.Get("dependencyType") var depType issues_model.DependencyType diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go index abd68630a4..a5f6c02c7a 100644 --- a/routers/web/repo/repo.go +++ b/routers/web/repo/repo.go @@ -480,12 +480,6 @@ func Download(ctx *context.Context) { func download(ctx *context.Context, archiveName string, archiver *repo_model.RepoArchiver) { downloadName := ctx.Repo.Repository.Name + "-" + archiveName - // Add nix format link header so tarballs lock correctly: - // https://github.com/nixos/nix/blob/56763ff918eb308db23080e560ed2ea3e00c80a7/doc/manual/src/protocols/tarball-fetcher.md - ctx.Resp.Header().Add("Link", fmt.Sprintf("<%s/archive/%s.tar.gz?rev=%s>; rel=\"immutable\"", - ctx.Repo.Repository.APIURL(), - archiver.CommitID, archiver.CommitID)) - rPath := archiver.RelativePath() if setting.RepoArchive.Storage.MinioConfig.ServeDirect { // If we have a signed url (S3, object storage), redirect to this directly. diff --git a/templates/org/menu.tmpl b/templates/org/menu.tmpl index 212154995d..1860a3765a 100644 --- a/templates/org/menu.tmpl +++ b/templates/org/menu.tmpl @@ -6,7 +6,6 @@ {{if .RepoCount}}
{{.RepoCount}}
{{end}} - {{if .CanReadProjects}} @@ -14,7 +13,6 @@ {{if .ProjectCount}}
{{.ProjectCount}}
{{end}} - {{end}} {{if and .IsPackageEnabled .CanReadPackages}} @@ -33,7 +31,6 @@
{{.NumMembers}}
{{end}} - {{if .IsOrganizationMember}} {{svg "octicon-people"}} {{ctx.Locale.Tr "org.teams"}} @@ -42,7 +39,6 @@ {{end}} {{end}} - {{if .IsOrganizationOwner}} {{svg "octicon-tools"}} {{ctx.Locale.Tr "repo.settings"}} diff --git a/templates/user/overview/header.tmpl b/templates/user/overview/header.tmpl index 1ec83042a3..275c4e295e 100644 --- a/templates/user/overview/header.tmpl +++ b/templates/user/overview/header.tmpl @@ -10,7 +10,6 @@ {{if .RepoCount}}
{{.RepoCount}}
{{end}} - {{if or .ContextUser.IsIndividual .CanReadProjects}} @@ -18,7 +17,6 @@ {{if .ProjectCount}}
{{.ProjectCount}}
{{end}} - {{end}} {{if and .IsPackageEnabled (or .ContextUser.IsIndividual .CanReadPackages)}} diff --git a/tests/integration/api_repo_archive_test.go b/tests/integration/api_repo_archive_test.go index a4ae599615..c574d49450 100644 --- a/tests/integration/api_repo_archive_test.go +++ b/tests/integration/api_repo_archive_test.go @@ -8,7 +8,6 @@ import ( "io" "net/http" "net/url" - "regexp" "testing" auth_model "code.gitea.io/gitea/models/auth" @@ -42,16 +41,6 @@ func TestAPIDownloadArchive(t *testing.T) { assert.Len(t, bs, 266) assert.EqualValues(t, "application/gzip", resp.Header().Get("Content-Type")) - // Must return a link to a commit ID as the "immutable" archive link - linkHeaderRe := regexp.MustCompile(`<(?Phttps?://.*/api/v1/repos/user2/repo1/archive/[a-f0-9]+\.tar\.gz.*)>; rel="immutable"`) - m := linkHeaderRe.FindStringSubmatch(resp.Header().Get("Link")) - assert.NotEmpty(t, m[1]) - resp = MakeRequest(t, NewRequest(t, "GET", m[1]).AddTokenAuth(token), http.StatusOK) - bs2, err := io.ReadAll(resp.Body) - assert.NoError(t, err) - // The locked URL should give the same bytes as the non-locked one - assert.EqualValues(t, bs, bs2) - link, _ = url.Parse(fmt.Sprintf("/api/v1/repos/%s/%s/archive/master.bundle", user2.Name, repo.Name)) resp = MakeRequest(t, NewRequest(t, "GET", link.String()).AddTokenAuth(token), http.StatusOK) bs, err = io.ReadAll(resp.Body) diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index b63127be82..e09656c4ee 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -15,7 +15,6 @@ import ( "testing" "time" - auth_model "code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" @@ -195,93 +194,6 @@ func TestNewIssue(t *testing.T) { testNewIssue(t, session, "user2", "repo1", "Title", "Description") } -func TestIssueDependencies(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - owner := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1}) - session := loginUser(t, owner.Name) - token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteIssue) - - repo, _, f := CreateDeclarativeRepoWithOptions(t, owner, DeclarativeRepoOptions{}) - defer f() - - createIssue := func(t *testing.T, title string) api.Issue { - t.Helper() - - urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues", owner.Name, repo.Name) - req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateIssueOption{ - Body: "", - Title: title, - }).AddTokenAuth(token) - resp := MakeRequest(t, req, http.StatusCreated) - - var apiIssue api.Issue - DecodeJSON(t, resp, &apiIssue) - - return apiIssue - } - addDependency := func(t *testing.T, issue, dependency api.Issue) { - t.Helper() - - urlStr := fmt.Sprintf("/%s/%s/issues/%d/dependency/add", owner.Name, repo.Name, issue.Index) - req := NewRequestWithValues(t, "POST", urlStr, map[string]string{ - "_csrf": GetCSRF(t, session, fmt.Sprintf("/%s/%s/issues/%d", owner.Name, repo.Name, issue.Index)), - "newDependency": fmt.Sprintf("%d", dependency.Index), - }) - session.MakeRequest(t, req, http.StatusSeeOther) - } - removeDependency := func(t *testing.T, issue, dependency api.Issue) { - t.Helper() - - urlStr := fmt.Sprintf("/%s/%s/issues/%d/dependency/delete", owner.Name, repo.Name, issue.Index) - req := NewRequestWithValues(t, "POST", urlStr, map[string]string{ - "_csrf": GetCSRF(t, session, fmt.Sprintf("/%s/%s/issues/%d", owner.Name, repo.Name, issue.Index)), - "removeDependencyID": fmt.Sprintf("%d", dependency.Index), - "dependencyType": "blockedBy", - }) - session.MakeRequest(t, req, http.StatusSeeOther) - } - - assertHasDependency := func(t *testing.T, issueID, dependencyID int64, hasDependency bool) { - t.Helper() - - urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/issues/%d/dependencies", owner.Name, repo.Name, issueID) - req := NewRequest(t, "GET", urlStr) - resp := MakeRequest(t, req, http.StatusOK) - - var issues []api.Issue - DecodeJSON(t, resp, &issues) - - if hasDependency { - assert.NotEmpty(t, issues) - assert.EqualValues(t, issues[0].Index, dependencyID) - } else { - assert.Empty(t, issues) - } - } - - t.Run("Add dependency", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - issue1 := createIssue(t, "issue #1") - issue2 := createIssue(t, "issue #2") - addDependency(t, issue1, issue2) - - assertHasDependency(t, issue1.Index, issue2.Index, true) - }) - - t.Run("Remove dependency", func(t *testing.T) { - defer tests.PrintCurrentTest(t)() - - issue1 := createIssue(t, "issue #1") - issue2 := createIssue(t, "issue #2") - addDependency(t, issue1, issue2) - removeDependency(t, issue1, issue2) - - assertHasDependency(t, issue1.Index, issue2.Index, false) - }) -} - func TestIssueCommentClose(t *testing.T) { defer tests.PrepareTestEnv(t)() session := loginUser(t, "user2") diff --git a/tests/integration/user_count_test.go b/tests/integration/user_count_test.go deleted file mode 100644 index c0837d57fd..0000000000 --- a/tests/integration/user_count_test.go +++ /dev/null @@ -1,167 +0,0 @@ -// Copyright 2024 The Forgejo Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package integration - -import ( - "fmt" - "net/http" - "strconv" - "testing" - - "code.gitea.io/gitea/models/db" - "code.gitea.io/gitea/models/organization" - project_model "code.gitea.io/gitea/models/project" - repo_model "code.gitea.io/gitea/models/repo" - "code.gitea.io/gitea/models/unittest" - user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/optional" - "code.gitea.io/gitea/tests" - - "github.com/PuerkitoBio/goquery" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -type userCountTest struct { - doer *user_model.User - user *user_model.User - session *TestSession - repoCount int64 - projectCount int64 - memberCount int64 - teamCount int64 -} - -func (countTest *userCountTest) Init(t *testing.T, doerID, userID int64) { - countTest.doer = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: doerID}) - countTest.user = unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: userID}) - countTest.session = loginUser(t, countTest.doer.Name) - - var err error - - countTest.repoCount, err = repo_model.CountRepository(db.DefaultContext, &repo_model.SearchRepoOptions{ - Actor: countTest.doer, - OwnerID: countTest.user.ID, - Private: true, - Collaborate: optional.Some(false), - }) - require.NoError(t, err) - - var projectType project_model.Type - if countTest.user.IsOrganization() { - projectType = project_model.TypeOrganization - } else { - projectType = project_model.TypeIndividual - } - countTest.projectCount, err = db.Count[project_model.Project](db.DefaultContext, project_model.SearchOptions{ - OwnerID: countTest.user.ID, - IsClosed: optional.Some(false), - Type: projectType, - }) - require.NoError(t, err) - - if !countTest.user.IsOrganization() { - return - } - - org := (*organization.Organization)(countTest.user) - - isMember, err := org.IsOrgMember(db.DefaultContext, countTest.doer.ID) - require.NoError(t, err) - - countTest.memberCount, err = organization.CountOrgMembers(db.DefaultContext, &organization.FindOrgMembersOpts{ - OrgID: org.ID, - PublicOnly: !isMember, - }) - require.NoError(t, err) - - teams, err := org.LoadTeams(db.DefaultContext) - require.NoError(t, err) - - countTest.teamCount = int64(len(teams)) -} - -func (countTest *userCountTest) getCount(doc *goquery.Document, name string) (int64, error) { - selection := doc.Find(fmt.Sprintf("[test-name=\"%s\"]", name)) - - if selection.Length() != 1 { - return 0, fmt.Errorf("%s was not found", name) - } - - return strconv.ParseInt(selection.Text(), 10, 64) -} - -func (countTest *userCountTest) TestPage(t *testing.T, page string, orgLink bool) { - t.Run(page, func(t *testing.T) { - var userLink string - - if orgLink { - userLink = countTest.user.OrganisationLink() - } else { - userLink = countTest.user.HomeLink() - } - - req := NewRequestf(t, "GET", "%s/%s", userLink, page) - resp := countTest.session.MakeRequest(t, req, http.StatusOK) - htmlDoc := NewHTMLParser(t, resp.Body) - - repoCount, err := countTest.getCount(htmlDoc.doc, "repository-count") - require.NoError(t, err) - assert.Equal(t, countTest.repoCount, repoCount) - - projectCount, err := countTest.getCount(htmlDoc.doc, "project-count") - require.NoError(t, err) - assert.Equal(t, countTest.projectCount, projectCount) - - if !countTest.user.IsOrganization() { - return - } - - memberCount, err := countTest.getCount(htmlDoc.doc, "member-count") - require.NoError(t, err) - assert.Equal(t, countTest.memberCount, memberCount) - - teamCount, err := countTest.getCount(htmlDoc.doc, "team-count") - require.NoError(t, err) - assert.Equal(t, countTest.teamCount, teamCount) - }) -} - -func TestFrontendHeaderCountUser(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - countTest := new(userCountTest) - countTest.Init(t, 2, 2) - - countTest.TestPage(t, "", false) - countTest.TestPage(t, "?tab=repositories", false) - countTest.TestPage(t, "-/projects", false) - countTest.TestPage(t, "-/packages", false) - countTest.TestPage(t, "?tab=activity", false) - countTest.TestPage(t, "?tab=stars", false) -} - -func TestFrontendHeaderCountOrg(t *testing.T) { - defer tests.PrepareTestEnv(t)() - - countTest := new(userCountTest) - countTest.Init(t, 15, 17) - - countTest.TestPage(t, "", false) - countTest.TestPage(t, "-/projects", false) - countTest.TestPage(t, "-/packages", false) - countTest.TestPage(t, "members", true) - countTest.TestPage(t, "teams", true) - - countTest.TestPage(t, "settings", true) - countTest.TestPage(t, "settings/hooks", true) - countTest.TestPage(t, "settings/labels", true) - countTest.TestPage(t, "settings/applications", true) - countTest.TestPage(t, "settings/packages", true) - countTest.TestPage(t, "settings/actions/runners", true) - countTest.TestPage(t, "settings/actions/secrets", true) - countTest.TestPage(t, "settings/actions/variables", true) - countTest.TestPage(t, "settings/blocked_users", true) - countTest.TestPage(t, "settings/delete", true) -} diff --git a/web_src/css/themes/theme-forgejo-dark.css b/web_src/css/themes/theme-forgejo-dark.css index 95d35ddec0..42495c854b 100644 --- a/web_src/css/themes/theme-forgejo-dark.css +++ b/web_src/css/themes/theme-forgejo-dark.css @@ -141,7 +141,6 @@ /* other colors */ --color-gold: #b1983b; --color-white: #ffffff; - --color-pure-black: #000000; --color-diff-removed-word-bg: #783030; --color-diff-added-word-bg: #255c39; --color-diff-removed-row-bg: #432121; @@ -305,7 +304,7 @@ i.grey.icon.icon.icon.icon { } ::selection { background: var(--steel-100) !important; - color: var(--color-pure-black) !important; + color: var(--color-white) !important; } strong.attention-important, svg.attention-important { color: var(--color-violet-light);