From 48a4d39deb5ba2f03de77f9f5636384e20e0934b Mon Sep 17 00:00:00 2001 From: Henriette Darge Date: Mon, 20 Apr 2026 15:39:39 +0200 Subject: [PATCH] Bump pvc to 0.84.4 and octicons to 19.34.0 --- Gemfile | 6 +- Gemfile.lock | 22 +++---- .../work_package_types/pattern_input.sass | 2 +- frontend/package-lock.json | 63 ++++++++++--------- frontend/package.json | 6 +- .../redmine/menu_manager/menu_helper_spec.rb | 44 ++++++------- 6 files changed, 72 insertions(+), 71 deletions(-) diff --git a/Gemfile b/Gemfile index fedf29eb877..0b4b746cd4b 100644 --- a/Gemfile +++ b/Gemfile @@ -430,6 +430,6 @@ gemfiles.each do |file| send(:eval_gemfile, file) if File.readable?(file) end -gem "openproject-octicons", "~>19.32.0" -gem "openproject-octicons_helper", "~>19.32.0" -gem "openproject-primer_view_components", "~>0.84.1" +gem "openproject-octicons", "~>19.34.0" +gem "openproject-octicons_helper", "~>19.34.0" +gem "openproject-primer_view_components", "~>0.84.4" diff --git a/Gemfile.lock b/Gemfile.lock index b75a348f297..f1f2cbbd0c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -903,15 +903,15 @@ GEM validate_email validate_url webfinger (~> 2.0) - openproject-octicons (19.32.1) - openproject-octicons_helper (19.32.1) + openproject-octicons (19.34.0) + openproject-octicons_helper (19.34.0) actionview - openproject-octicons (= 19.32.1) + openproject-octicons (= 19.34.0) railties - openproject-primer_view_components (0.84.1) + openproject-primer_view_components (0.84.4) actionview (>= 7.2.0) activesupport (>= 7.2.0) - openproject-octicons (>= 19.30.1) + openproject-octicons (>= 19.34.0) view_component (>= 3.1, < 5.0) openproject-token (8.8.2) activemodel @@ -1685,10 +1685,10 @@ DEPENDENCIES openproject-job_status! openproject-ldap_groups! openproject-meeting! - openproject-octicons (~> 19.32.0) - openproject-octicons_helper (~> 19.32.0) + openproject-octicons (~> 19.34.0) + openproject-octicons_helper (~> 19.34.0) openproject-openid_connect! - openproject-primer_view_components (~> 0.84.1) + openproject-primer_view_components (~> 0.84.4) openproject-recaptcha! openproject-reporting! openproject-storages! @@ -2067,10 +2067,10 @@ CHECKSUMS openproject-job_status (1.0.0) openproject-ldap_groups (1.0.0) openproject-meeting (1.0.0) - openproject-octicons (19.32.1) sha256=32253f3256ad4e1aec36442558ce140623c01e5241d9b90f6eb6d317f462781e - openproject-octicons_helper (19.32.1) sha256=7676059927ae940170fb13d62f88b885985a3f0d483e1bb246475afcffd90f8f + openproject-octicons (19.34.0) sha256=4efe8a58a2d8051b79c94b37e9a7f04fd242a4da12b50f027c3c7f441a042adc + openproject-octicons_helper (19.34.0) sha256=12eb7af2214e21631369c76464ebaa30de788e1074c4b3bd0fcef7e74cb9edb4 openproject-openid_connect (1.0.0) - openproject-primer_view_components (0.84.1) sha256=ea0a8da1bc45c8f0ddc13ab279535297ca63f974da72449fbb3a9e4b4e9753d7 + openproject-primer_view_components (0.84.4) sha256=712b6dcfd64771d0f8e1f8a73a32238b0798b9971a569257086c4823642571e2 openproject-recaptcha (1.0.0) openproject-reporting (1.0.0) openproject-storages (1.0.0) diff --git a/app/components/work_package_types/pattern_input.sass b/app/components/work_package_types/pattern_input.sass index 1632478bcb3..29abab359dd 100644 --- a/app/components/work_package_types/pattern_input.sass +++ b/app/components/work_package_types/pattern_input.sass @@ -1,4 +1,4 @@ -$pattern-input-height: calc(3*var(--control-medium-lineBoxHeight) + var(--control-medium-paddingInline-condensed)) +$pattern-input-height: calc(3*var(--base-size-20) + var(--control-medium-paddingInline-condensed)) .op-pattern-input &--text-field diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 73538ba4860..2ec3138943d 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -56,13 +56,13 @@ "@ng-select/ng-option-highlight": "^20.6.3", "@ng-select/ng-select": "^20.1.0", "@ngneat/content-loader": "^7.0.0", - "@openproject/octicons-angular": "^19.32.0", - "@openproject/primer-view-components": "^0.84.1", + "@openproject/octicons-angular": "^19.34.0", + "@openproject/primer-view-components": "^0.84.4", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^22.1.0", "@primer/live-region-element": "^0.8.0", "@primer/primitives": "^11.5.1", - "@primer/view-components": "npm:@openproject/primer-view-components@^0.84.1", + "@primer/view-components": "npm:@openproject/primer-view-components@^0.84.4", "@rails/request.js": "^0.0.13", "@stimulus-components/auto-submit": "^6.0.0", "@stimulus-components/reveal": "^5.0.0", @@ -5192,9 +5192,10 @@ "integrity": "sha512-KtOPaB+FiKJ6jcKm9UKyaM5fPURHGf+xcp+b4Mzoi81hOc6M1sIGpMZMAVbNzfa2lW5+RPGKq888Px0j76OZ/A==" }, "node_modules/@github/relative-time-element": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@github/relative-time-element/-/relative-time-element-4.3.0.tgz", - "integrity": "sha512-+tFjX9//HRS1HnBa5cNgfEtE52arwiutYg1TOF+Trk40SPxst9Q8Rtc3BKD6aKsvfbtub68vfhipgchGjj9o7g==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@github/relative-time-element/-/relative-time-element-5.0.0.tgz", + "integrity": "sha512-L/2r0DNR/rMbmHWcsdmhtOiy2gESoGOhItNFD4zJ3nZfHl79Dx3N18Vfx/pYr2lruMOdk1cJZb4wEumm+Dxm1w==", + "license": "MIT" }, "node_modules/@github/remote-input-element": { "version": "0.4.0", @@ -7397,9 +7398,9 @@ "license": "BSD-3-Clause" }, "node_modules/@openproject/octicons-angular": { - "version": "19.32.0", - "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.32.0.tgz", - "integrity": "sha512-tMGoKKju4kDi2uO9UQXncgkpDFuRN5CLxC+S3978TWm6WbYiv9ppf7uejF766aWkqqS13T5CK/LtYovPuBSrnQ==", + "version": "19.34.0", + "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.34.0.tgz", + "integrity": "sha512-RsTK48htb8zwb1C4M3quhZG6uGFWYPICR2rO9jckCpww4MgWQZKfFrSCH8r43+uOczjYorwktzn7CIJywGW9Rg==", "dependencies": { "tslib": "^2.3.0" }, @@ -7409,9 +7410,9 @@ } }, "node_modules/@openproject/primer-view-components": { - "version": "0.84.1", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.84.1.tgz", - "integrity": "sha512-ouSnwxqn78MxfcnLo+twd2W15cOJnsC+nTEqwLb76tGpW5HNF0R1gVdgRcmym/3SmcP+4eA8PPMIJOtGsieJCQ==", + "version": "0.84.4", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.84.4.tgz", + "integrity": "sha512-tyVgwz8+VEBgLjPKsnbXE4vKxRGpxx1qk8XSsolElgng4ZWyMrqMyMQoI/3BJggPkca4fmvjes6C7fp5o/7cuw==", "license": "MIT", "dependencies": { "@github/auto-check-element": "^6.0.0", @@ -7421,7 +7422,7 @@ "@github/details-menu-element": "^1.0.12", "@github/image-crop-element": "^5.0.0", "@github/include-fragment-element": "^6.3.0", - "@github/relative-time-element": "^4.0.0", + "@github/relative-time-element": "^5.0.0", "@github/remote-input-element": "^0.4.0", "@github/tab-container-element": "^3.1.2", "@oddbird/popover-polyfill": "^0.5.2", @@ -7813,9 +7814,9 @@ }, "node_modules/@primer/view-components": { "name": "@openproject/primer-view-components", - "version": "0.84.1", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.84.1.tgz", - "integrity": "sha512-ouSnwxqn78MxfcnLo+twd2W15cOJnsC+nTEqwLb76tGpW5HNF0R1gVdgRcmym/3SmcP+4eA8PPMIJOtGsieJCQ==", + "version": "0.84.4", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.84.4.tgz", + "integrity": "sha512-tyVgwz8+VEBgLjPKsnbXE4vKxRGpxx1qk8XSsolElgng4ZWyMrqMyMQoI/3BJggPkca4fmvjes6C7fp5o/7cuw==", "license": "MIT", "dependencies": { "@github/auto-check-element": "^6.0.0", @@ -7825,7 +7826,7 @@ "@github/details-menu-element": "^1.0.12", "@github/image-crop-element": "^5.0.0", "@github/include-fragment-element": "^6.3.0", - "@github/relative-time-element": "^4.0.0", + "@github/relative-time-element": "^5.0.0", "@github/remote-input-element": "^0.4.0", "@github/tab-container-element": "^3.1.2", "@oddbird/popover-polyfill": "^0.5.2", @@ -29007,9 +29008,9 @@ "integrity": "sha512-KtOPaB+FiKJ6jcKm9UKyaM5fPURHGf+xcp+b4Mzoi81hOc6M1sIGpMZMAVbNzfa2lW5+RPGKq888Px0j76OZ/A==" }, "@github/relative-time-element": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@github/relative-time-element/-/relative-time-element-4.3.0.tgz", - "integrity": "sha512-+tFjX9//HRS1HnBa5cNgfEtE52arwiutYg1TOF+Trk40SPxst9Q8Rtc3BKD6aKsvfbtub68vfhipgchGjj9o7g==" + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@github/relative-time-element/-/relative-time-element-5.0.0.tgz", + "integrity": "sha512-L/2r0DNR/rMbmHWcsdmhtOiy2gESoGOhItNFD4zJ3nZfHl79Dx3N18Vfx/pYr2lruMOdk1cJZb4wEumm+Dxm1w==" }, "@github/remote-input-element": { "version": "0.4.0", @@ -30350,17 +30351,17 @@ "integrity": "sha512-iFrvar5SOMtKFOSjYvs4z9UlLqDdJbMx0mgISLcPedv+g0ac5sgeETLGtipHCVIae6HJPclNEH5aCyD1RZaEHw==" }, "@openproject/octicons-angular": { - "version": "19.32.0", - "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.32.0.tgz", - "integrity": "sha512-tMGoKKju4kDi2uO9UQXncgkpDFuRN5CLxC+S3978TWm6WbYiv9ppf7uejF766aWkqqS13T5CK/LtYovPuBSrnQ==", + "version": "19.34.0", + "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.34.0.tgz", + "integrity": "sha512-RsTK48htb8zwb1C4M3quhZG6uGFWYPICR2rO9jckCpww4MgWQZKfFrSCH8r43+uOczjYorwktzn7CIJywGW9Rg==", "requires": { "tslib": "^2.3.0" } }, "@openproject/primer-view-components": { - "version": "0.84.1", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.84.1.tgz", - "integrity": "sha512-ouSnwxqn78MxfcnLo+twd2W15cOJnsC+nTEqwLb76tGpW5HNF0R1gVdgRcmym/3SmcP+4eA8PPMIJOtGsieJCQ==", + "version": "0.84.4", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.84.4.tgz", + "integrity": "sha512-tyVgwz8+VEBgLjPKsnbXE4vKxRGpxx1qk8XSsolElgng4ZWyMrqMyMQoI/3BJggPkca4fmvjes6C7fp5o/7cuw==", "requires": { "@github/auto-check-element": "^6.0.0", "@github/auto-complete-element": "^3.8.0", @@ -30369,7 +30370,7 @@ "@github/details-menu-element": "^1.0.12", "@github/image-crop-element": "^5.0.0", "@github/include-fragment-element": "^6.3.0", - "@github/relative-time-element": "^4.0.0", + "@github/relative-time-element": "^5.0.0", "@github/remote-input-element": "^0.4.0", "@github/tab-container-element": "^3.1.2", "@oddbird/popover-polyfill": "^0.5.2", @@ -30553,9 +30554,9 @@ "integrity": "sha512-NB9uYfJ01FVY6zp+33EoUbJ0paS3JrWY+PqdHPebTvyRtQgL3sX8//3jWqjt3/jL81UMEulJRM2A0hPj0/vFpQ==" }, "@primer/view-components": { - "version": "npm:@openproject/primer-view-components@0.84.1", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.84.1.tgz", - "integrity": "sha512-ouSnwxqn78MxfcnLo+twd2W15cOJnsC+nTEqwLb76tGpW5HNF0R1gVdgRcmym/3SmcP+4eA8PPMIJOtGsieJCQ==", + "version": "npm:@openproject/primer-view-components@0.84.4", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.84.4.tgz", + "integrity": "sha512-tyVgwz8+VEBgLjPKsnbXE4vKxRGpxx1qk8XSsolElgng4ZWyMrqMyMQoI/3BJggPkca4fmvjes6C7fp5o/7cuw==", "requires": { "@github/auto-check-element": "^6.0.0", "@github/auto-complete-element": "^3.8.0", @@ -30564,7 +30565,7 @@ "@github/details-menu-element": "^1.0.12", "@github/image-crop-element": "^5.0.0", "@github/include-fragment-element": "^6.3.0", - "@github/relative-time-element": "^4.0.0", + "@github/relative-time-element": "^5.0.0", "@github/remote-input-element": "^0.4.0", "@github/tab-container-element": "^3.1.2", "@oddbird/popover-polyfill": "^0.5.2", diff --git a/frontend/package.json b/frontend/package.json index 23d47db5df8..3193c9001b9 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -111,13 +111,13 @@ "@ng-select/ng-option-highlight": "^20.6.3", "@ng-select/ng-select": "^20.1.0", "@ngneat/content-loader": "^7.0.0", - "@openproject/octicons-angular": "^19.32.0", - "@openproject/primer-view-components": "^0.84.1", + "@openproject/octicons-angular": "^19.34.0", + "@openproject/primer-view-components": "^0.84.4", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^22.1.0", "@primer/live-region-element": "^0.8.0", "@primer/primitives": "^11.5.1", - "@primer/view-components": "npm:@openproject/primer-view-components@^0.84.1", + "@primer/view-components": "npm:@openproject/primer-view-components@^0.84.4", "@rails/request.js": "^0.0.13", "@stimulus-components/auto-submit": "^6.0.0", "@stimulus-components/reveal": "^5.0.0", diff --git a/spec/lib/redmine/menu_manager/menu_helper_spec.rb b/spec/lib/redmine/menu_manager/menu_helper_spec.rb index b25808b4ffd..8b47461453a 100644 --- a/spec/lib/redmine/menu_manager/menu_helper_spec.rb +++ b/spec/lib/redmine/menu_manager/menu_helper_spec.rb @@ -110,15 +110,15 @@ RSpec.describe Redmine::MenuManager::MenuHelper, type: :helper do
- Parent node @@ -274,15 +274,15 @@ RSpec.describe Redmine::MenuManager::MenuHelper, type: :helper do
- Parent node @@ -395,8 +395,8 @@ RSpec.describe Redmine::MenuManager::MenuHelper, type: :helper do
@@ -406,8 +406,8 @@ RSpec.describe Redmine::MenuManager::MenuHelper, type: :helper do data-tour-selector="main-menu--arrow-left_parent_node" data-test-selector="main-menu--arrow-left-to-project" href="#" aria-label="Go back one menu level" tabindex="0"> -
- Parent node
@@ -495,15 +495,15 @@ RSpec.describe Redmine::MenuManager::MenuHelper, type: :helper do
- Child node @@ -523,8 +523,8 @@ RSpec.describe Redmine::MenuManager::MenuHelper, type: :helper do data-action="menus--main#ascend keydown.enter->menus--main#ascend" data-tour-selector="main-menu--arrow-left_parent_node" data-test-selector="main-menu--arrow-left-to-project" href="#" aria-label="Go back one menu level" tabindex="0"> -