diff --git a/Gemfile b/Gemfile index 8921581eec1..ab7a625e588 100644 --- a/Gemfile +++ b/Gemfile @@ -417,6 +417,6 @@ gemfiles.each do |file| send(:eval_gemfile, file) if File.readable?(file) end -gem "openproject-octicons", "~>19.28.0" -gem "openproject-octicons_helper", "~>19.28.0" -gem "openproject-primer_view_components", "~>0.72.0" +gem "openproject-octicons", "~>19.29.0" +gem "openproject-octicons_helper", "~>19.29.0" +gem "openproject-primer_view_components", "~>0.72.1" diff --git a/Gemfile.lock b/Gemfile.lock index 1b9a68bf39e..e7368a71688 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -875,15 +875,15 @@ GEM validate_email validate_url webfinger (~> 2.0) - openproject-octicons (19.28.0) - openproject-octicons_helper (19.28.0) + openproject-octicons (19.29.0) + openproject-octicons_helper (19.29.0) actionview - openproject-octicons (= 19.28.0) + openproject-octicons (= 19.29.0) railties - openproject-primer_view_components (0.72.0) + openproject-primer_view_components (0.72.1) actionview (>= 7.2.0) activesupport (>= 7.2.0) - openproject-octicons (>= 19.25.0) + openproject-octicons (>= 19.29.0) view_component (>= 3.1, < 5.0) openproject-token (7.3.0) activemodel @@ -1693,10 +1693,10 @@ DEPENDENCIES openproject-job_status! openproject-ldap_groups! openproject-meeting! - openproject-octicons (~> 19.28.0) - openproject-octicons_helper (~> 19.28.0) + openproject-octicons (~> 19.29.0) + openproject-octicons_helper (~> 19.29.0) openproject-openid_connect! - openproject-primer_view_components (~> 0.72.0) + openproject-primer_view_components (~> 0.72.1) openproject-recaptcha! openproject-reporting! openproject-storages! @@ -2073,10 +2073,10 @@ CHECKSUMS openproject-job_status (1.0.0) openproject-ldap_groups (1.0.0) openproject-meeting (1.0.0) - openproject-octicons (19.28.0) sha256=b51010b4744fc6c1ef0d65b1922a53ad970054a3c1d634ebaba16ef12d768f83 - openproject-octicons_helper (19.28.0) sha256=140ec3ff44a92d606c0a68dfafc5e716636e6485192109bbb65ec2a340e07a4f + openproject-octicons (19.29.0) sha256=9d9106a276d140a2ba975052688b0c92e404af0df5db87d322265ac5c15e8815 + openproject-octicons_helper (19.29.0) sha256=d093d91163b27d1624841590a8e6b202186d165ad7d006ceadc8bdc3b09830e6 openproject-openid_connect (1.0.0) - openproject-primer_view_components (0.72.0) sha256=ced12b6c420fea6c02a4540b2c759a32b17e7b677eab29543c4f4eeec3db9543 + openproject-primer_view_components (0.72.1) sha256=a14cea78d053f60534983cbe386ecfccb12c588107a62cf7c75fb6cde3d41f0e openproject-recaptcha (1.0.0) openproject-reporting (1.0.0) openproject-storages (1.0.0) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 48e7e2b0d7a..804ea088287 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -52,13 +52,13 @@ "@ng-select/ng-select": "^20.1.0", "@ngneat/content-loader": "^7.0.0", "@ngx-formly/core": "^6.1.4", - "@openproject/octicons-angular": "^19.28.0", - "@openproject/primer-view-components": "^0.72.0", + "@openproject/octicons-angular": "^19.29.0", + "@openproject/primer-view-components": "^0.72.1", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^22.0.2", "@primer/live-region-element": "^0.8.0", "@primer/primitives": "^11.0.0", - "@primer/view-components": "npm:@openproject/primer-view-components@^0.72.0", + "@primer/view-components": "npm:@openproject/primer-view-components@^0.72.1", "@rails/request.js": "^0.0.12", "@stimulus-components/auto-submit": "^6.0.0", "@types/hotwired__turbo": "^8.0.1", @@ -6362,9 +6362,9 @@ "license": "BSD-3-Clause" }, "node_modules/@openproject/octicons-angular": { - "version": "19.28.0", - "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.28.0.tgz", - "integrity": "sha512-YtCBaFSHS7E0P+Ht3HDdjcIPU10Pq8asQgUm+mJLwCfOe3Z50uPn5snkWosqe8A+GREBCWlXGa8vcdkh1J6V9Q==", + "version": "19.29.0", + "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.29.0.tgz", + "integrity": "sha512-Mkyx68TaLqL/7oIkS+0xDmjGYI7Ayw2DsvMQhP4CYbPR9Vaw/HArbBYu9C2k3MC0aKnnUF0Pwg+rWGcu5qKRAg==", "dependencies": { "tslib": "^2.3.0" }, @@ -6374,9 +6374,9 @@ } }, "node_modules/@openproject/primer-view-components": { - "version": "0.72.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.72.0.tgz", - "integrity": "sha512-qtT9eS0qAt0UG1oyfJN52l2jI8Z0+Sx0C5J+cvrk2R8c7pntGBigsYe18TK174rcRzxIeHApEm93iy3ByevUpA==", + "version": "0.72.1", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.72.1.tgz", + "integrity": "sha512-LGMq8hu71LHv/MNnR62SYP2lHR9V99r+D1gfiEblGEYm2iVamQQ/1ceWwkdfeTmMejFlty65EHieWWefURV9EQ==", "license": "MIT", "dependencies": { "@github/auto-check-element": "^6.0.0", @@ -6800,9 +6800,9 @@ }, "node_modules/@primer/view-components": { "name": "@openproject/primer-view-components", - "version": "0.72.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.72.0.tgz", - "integrity": "sha512-qtT9eS0qAt0UG1oyfJN52l2jI8Z0+Sx0C5J+cvrk2R8c7pntGBigsYe18TK174rcRzxIeHApEm93iy3ByevUpA==", + "version": "0.72.1", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.72.1.tgz", + "integrity": "sha512-LGMq8hu71LHv/MNnR62SYP2lHR9V99r+D1gfiEblGEYm2iVamQQ/1ceWwkdfeTmMejFlty65EHieWWefURV9EQ==", "license": "MIT", "dependencies": { "@github/auto-check-element": "^6.0.0", @@ -30595,17 +30595,17 @@ "integrity": "sha512-iFrvar5SOMtKFOSjYvs4z9UlLqDdJbMx0mgISLcPedv+g0ac5sgeETLGtipHCVIae6HJPclNEH5aCyD1RZaEHw==" }, "@openproject/octicons-angular": { - "version": "19.28.0", - "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.28.0.tgz", - "integrity": "sha512-YtCBaFSHS7E0P+Ht3HDdjcIPU10Pq8asQgUm+mJLwCfOe3Z50uPn5snkWosqe8A+GREBCWlXGa8vcdkh1J6V9Q==", + "version": "19.29.0", + "resolved": "https://registry.npmjs.org/@openproject/octicons-angular/-/octicons-angular-19.29.0.tgz", + "integrity": "sha512-Mkyx68TaLqL/7oIkS+0xDmjGYI7Ayw2DsvMQhP4CYbPR9Vaw/HArbBYu9C2k3MC0aKnnUF0Pwg+rWGcu5qKRAg==", "requires": { "tslib": "^2.3.0" } }, "@openproject/primer-view-components": { - "version": "0.72.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.72.0.tgz", - "integrity": "sha512-qtT9eS0qAt0UG1oyfJN52l2jI8Z0+Sx0C5J+cvrk2R8c7pntGBigsYe18TK174rcRzxIeHApEm93iy3ByevUpA==", + "version": "0.72.1", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.72.1.tgz", + "integrity": "sha512-LGMq8hu71LHv/MNnR62SYP2lHR9V99r+D1gfiEblGEYm2iVamQQ/1ceWwkdfeTmMejFlty65EHieWWefURV9EQ==", "requires": { "@github/auto-check-element": "^6.0.0", "@github/auto-complete-element": "^3.8.0", @@ -30816,9 +30816,9 @@ "integrity": "sha512-edsofzVG67EobXGRrqFc/kfjzKh8wbq1wEmRc1vmRNqDJNMxBRWZ9bT2AzKvcv+Hbf7olDAPkrSqVHbO4hhr/A==" }, "@primer/view-components": { - "version": "npm:@openproject/primer-view-components@0.72.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.72.0.tgz", - "integrity": "sha512-qtT9eS0qAt0UG1oyfJN52l2jI8Z0+Sx0C5J+cvrk2R8c7pntGBigsYe18TK174rcRzxIeHApEm93iy3ByevUpA==", + "version": "npm:@openproject/primer-view-components@0.72.1", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.72.1.tgz", + "integrity": "sha512-LGMq8hu71LHv/MNnR62SYP2lHR9V99r+D1gfiEblGEYm2iVamQQ/1ceWwkdfeTmMejFlty65EHieWWefURV9EQ==", "requires": { "@github/auto-check-element": "^6.0.0", "@github/auto-complete-element": "^3.8.0", diff --git a/frontend/package.json b/frontend/package.json index 47b19314706..3136fb12b6d 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -108,13 +108,13 @@ "@ng-select/ng-select": "^20.1.0", "@ngneat/content-loader": "^7.0.0", "@ngx-formly/core": "^6.1.4", - "@openproject/octicons-angular": "^19.28.0", - "@openproject/primer-view-components": "^0.72.0", + "@openproject/octicons-angular": "^19.29.0", + "@openproject/primer-view-components": "^0.72.1", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^22.0.2", "@primer/live-region-element": "^0.8.0", "@primer/primitives": "^11.0.0", - "@primer/view-components": "npm:@openproject/primer-view-components@^0.72.0", + "@primer/view-components": "npm:@openproject/primer-view-components@^0.72.1", "@rails/request.js": "^0.0.12", "@stimulus-components/auto-submit": "^6.0.0", "@types/hotwired__turbo": "^8.0.1", diff --git a/lib/open_project/patches/primer_page_header_breadcrumb.rb b/lib/open_project/patches/primer_page_header_breadcrumb.rb index 65449738d27..29b792cf4c1 100644 --- a/lib/open_project/patches/primer_page_header_breadcrumb.rb +++ b/lib/open_project/patches/primer_page_header_breadcrumb.rb @@ -40,6 +40,6 @@ module OpenProject end end -OpenProject::Patches.patch_gem_version "openproject-primer_view_components", "0.72.0" do +OpenProject::Patches.patch_gem_version "openproject-primer_view_components", "0.72.1" do Primer::OpenProject::PageHeader.prepend OpenProject::Patches::PrimerPageHeaderBreadcrumb end diff --git a/modules/meeting/app/components/meetings/side_panel/attachments_component.html.erb b/modules/meeting/app/components/meetings/side_panel/attachments_component.html.erb index 54de695689a..fada334f1ed 100644 --- a/modules/meeting/app/components/meetings/side_panel/attachments_component.html.erb +++ b/modules/meeting/app/components/meetings/side_panel/attachments_component.html.erb @@ -16,7 +16,7 @@ id: "meetings-add-attachments", classes: "hide-when-print" ) do |button| - button.with_leading_visual_icon(icon: "op-attachmentadd") + button.with_leading_visual_icon(icon: "op-add-attachment") t("js.label_add_attachments") end