Merge pull request #13337 from opf/housekeeping/bump-octicons

Bump octicons packages and add helper gem
opf · Aug 2, 2023 · f217ad5 · f217ad5
2 parents e495059 + d756bbb
commit f217ad5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/Gemfile b/Gemfile
@@ -355,4 +355,5 @@ gemfiles.each do |file|
 end
 
 gem "primer_view_components", git: 'https://github.com/opf/primer_view_components', ref: '18abe4d'
-gem "openproject-octicons", '~>19.6.3'
+gem "openproject-octicons", '~>19.6.7'
+gem "openproject-octicons_helper", '~>19.6.7'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -673,7 +673,11 @@ GEM
       validate_email
       validate_url
       webfinger (~> 2.0)
-    openproject-octicons (19.6.6)
+    openproject-octicons (19.6.7)
+    openproject-octicons_helper (19.6.7)
+      actionview
+      openproject-octicons (= 19.6.7)
+      railties
     openproject-token (3.0.1)
       activemodel
     os (1.1.4)
@@ -1098,7 +1102,8 @@ DEPENDENCIES
   openproject-job_status!
   openproject-ldap_groups!
   openproject-meeting!
-  openproject-octicons (~> 19.6.3)
+  openproject-octicons (~> 19.6.7)
+  openproject-octicons_helper (~> 19.6.7)
   openproject-openid_connect!
   openproject-recaptcha!
   openproject-reporting!

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -116,7 +116,7 @@
     "@ng-select/ng-select": "^11.0.0",
     "@ngneat/content-loader": "^7.0.0",
     "@ngx-formly/core": "^6.1.4",
-    "@openproject/octicons-angular": "^19.6.5",
+    "@openproject/octicons-angular": "^19.6.7",
     "@openproject/reactivestates": "^3.0.1",
     "@primer/css": "^21.0.2",
     "@primer/primitives": "^7.11.12",