diff --git a/backend/packagegroups/NuGet.props b/backend/packagegroups/NuGet.props index d6706d5a903..80caac4ea61 100644 --- a/backend/packagegroups/NuGet.props +++ b/backend/packagegroups/NuGet.props @@ -9,7 +9,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/frontend/language/src/nb.json b/frontend/language/src/nb.json index 90d15ebbf7d..31f8694a6e5 100644 --- a/frontend/language/src/nb.json +++ b/frontend/language/src/nb.json @@ -1068,7 +1068,7 @@ "schema_editor.custom_props_help": "Dette er egenskaper som ikke støttes av Altinn Studio, men som er satt inn på datamodellen ved hjelp av andre verktøy. Her kan man slette egenskepene eller endre deres verdier, men det er ikke mulig å legge til nye. Vær oppmerksom på at egenskaper som slettes fra denne listen ikke kan legges til igjen ved hjelp av Altinn Studio.", "schema_editor.custom_props_unknown_format": "Ukjent format", "schema_editor.custom_props_unknown_format_help": "Denne egenskapen har et format som ikke kan forhåndsvises eller redigeres i Altinn Studio.", - "schema_editor.datamodel_definition_field_deletion_text": "Feltet du vil slette tilhører en aktiv type og vil påvirke alle tilknyttede områder. Er du sikker på slettingen?", + "schema_editor.datamodel_definition_field_deletion_text": "Feltet du prøver å slette tilhører en aktiv type som er i bruk i datamodellen. Om du sletter dette feltet vil det slettes alle steder i datamodellen der denne typen er i bruk. Vil du slette feltet?", "schema_editor.datamodel_field_deletion_confirm": "Ja, slett feltet", "schema_editor.datamodel_field_deletion_info": "Forsikre deg om at feltet ikke er knyttet til noen oppsett eller regler før du sletter det.", "schema_editor.datamodel_field_deletion_text": "Er du sikker på at du vil slette dette feltet?", diff --git a/frontend/testing/playwright/playwright.config.ts b/frontend/testing/playwright/playwright.config.ts index 19880ea2561..8f0d8ef3b2b 100644 --- a/frontend/testing/playwright/playwright.config.ts +++ b/frontend/testing/playwright/playwright.config.ts @@ -14,6 +14,7 @@ export default defineConfig({ baseURL: process.env.PLAYWRIGHT_TEST_BASE_URL, }, fullyParallel: false, + timeout: 3 * 60 * 1000, forbidOnly: !!process.env.CI, retries: process.env.CI ? 2 : 0, workers: process.env.CI ? 1 : undefined, diff --git a/gitea/Dockerfile b/gitea/Dockerfile index 282c9a9547a..07708a69afc 100644 --- a/gitea/Dockerfile +++ b/gitea/Dockerfile @@ -1,4 +1,4 @@ -FROM gitea/gitea:1.21.4-rootless +FROM gitea/gitea:1.21.5-rootless USER 0:0 RUN apk --no-cache upgrade expat git libxml2 libcurl curl USER 1000:1000 diff --git a/package.json b/package.json index edfb54fba1d..5ca75ac0b16 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@redux-saga/symbols": "1.1.3", "@svgr/webpack": "8.1.0", "@swc/core": "1.3.104", - "@swc/jest": "0.2.31", + "@swc/jest": "0.2.34", "@testing-library/dom": "9.3.4", "@testing-library/jest-dom": "6.2.0", "@testing-library/react": "14.1.2", @@ -68,7 +68,7 @@ "source-map-loader": "4.0.2", "style-loader": "3.3.4", "svg-inline-loader": "0.8.2", - "swc-loader": "0.2.3", + "swc-loader": "0.2.4", "terser-webpack-plugin": "5.3.10", "ts-loader": "9.5.1", "ts-morph": "21.0.1", diff --git a/yarn.lock b/yarn.lock index c8e92dab3bd..e6d871cd919 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4051,15 +4051,15 @@ __metadata: languageName: node linkType: hard -"@swc/jest@npm:0.2.31": - version: 0.2.31 - resolution: "@swc/jest@npm:0.2.31" +"@swc/jest@npm:0.2.34": + version: 0.2.34 + resolution: "@swc/jest@npm:0.2.34" dependencies: "@jest/create-cache-key-function": "npm:^29.7.0" jsonc-parser: "npm:^3.2.0" peerDependencies: "@swc/core": "*" - checksum: cbd5a2c4919bc1abd8be29d6a027a800bd6781ff655c6d2f6eceb9b1969ee5b3ffa030c99aae53a1bfd0e43a98bc801f648a630df5e0470810df3e9a706c5c5a + checksum: cb588901bea0ad47da1966ecfb8e738017d5692142bff04beaa5539f619fff64c94597e6fed73db3a72af7c356f0019832fbe84864e571ecef99dbf5e80219a5 languageName: node linkType: hard @@ -5467,7 +5467,7 @@ __metadata: "@redux-saga/symbols": "npm:1.1.3" "@svgr/webpack": "npm:8.1.0" "@swc/core": "npm:1.3.104" - "@swc/jest": "npm:0.2.31" + "@swc/jest": "npm:0.2.34" "@tanstack/react-query": "npm:5.17.15" "@tanstack/react-query-devtools": "npm:5.17.18" "@testing-library/dom": "npm:9.3.4" @@ -5518,7 +5518,7 @@ __metadata: source-map-loader: "npm:4.0.2" style-loader: "npm:3.3.4" svg-inline-loader: "npm:0.8.2" - swc-loader: "npm:0.2.3" + swc-loader: "npm:0.2.4" terser-webpack-plugin: "npm:5.3.10" ts-loader: "npm:9.5.1" ts-morph: "npm:21.0.1" @@ -15445,13 +15445,13 @@ __metadata: languageName: node linkType: hard -"swc-loader@npm:0.2.3": - version: 0.2.3 - resolution: "swc-loader@npm:0.2.3" +"swc-loader@npm:0.2.4": + version: 0.2.4 + resolution: "swc-loader@npm:0.2.4" peerDependencies: "@swc/core": ^1.2.147 webpack: ">=2" - checksum: 010d84d399525c0185d36d62c86c55ae017e7a90046bc8a39be4b7e07526924037868049f6037bc966da98151cb2600934b96a66279b742d3c413a718b427251 + checksum: f23bfe8900b35abdcb9910a2749f3c9d66edf5c660afc67fcf7983647eaec322e024d1edd3bd9fd48bd3191eea0616f67b5f8b5f923e3a648fa5b448683c3213 languageName: node linkType: hard