Merge pull request #582 from doerfli/combine-prs-branch

Combined PR

Gemfile

@@ -29,7 +29,7 @@ gem 'jbuilder', '~> 2.11'
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
-gem "ffi", "~>1.16.3"
+gem "ffi", "~>1.17.1"
 
 # Use ActiveStorage variant
 # gem 'mini_magick', '~> 4.8'

Gemfile.lock

@@ -160,7 +160,10 @@ GEM
       logger
     faraday-net_http (3.4.0)
       net-http (>= 0.5.0)
-    ffi (1.16.3)
+    ffi (1.17.1-aarch64-linux-gnu)
+    ffi (1.17.1-aarch64-linux-musl)
+    ffi (1.17.1-x86_64-linux-gnu)
+    ffi (1.17.1-x86_64-linux-musl)
     globalid (1.2.1)
       activesupport (>= 6.1)
     hashie (5.0.0)
@@ -235,8 +238,12 @@ GEM
     nio4r (2.7.4)
     nokogiri (1.18.1-aarch64-linux-gnu)
       racc (~> 1.4)
+    nokogiri (1.18.1-aarch64-linux-musl)
+      racc (~> 1.4)
     nokogiri (1.18.1-x86_64-linux-gnu)
       racc (~> 1.4)
+    nokogiri (1.18.1-x86_64-linux-musl)
+      racc (~> 1.4)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
@@ -451,7 +458,7 @@ DEPENDENCIES
   debug (>= 1.0.0)
   dotenv-rails
   factory_bot_rails (~> 6.4.2)
-  ffi (~> 1.16.3)
+  ffi (~> 1.17.1)
   image_processing (~> 1.13)
   jbuilder (~> 2.11)
   jsbundling-rails

package.json

@@ -2,22 +2,22 @@
   "name": "reeper",
   "private": true,
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^6.6.0",
+    "@fortawesome/fontawesome-free": "^6.7.2",
     "@hotwired/stimulus": "^3.2.2",
     "@hotwired/stimulus-webpack-helpers": "^1.0.1",
     "@rails/actiontext": "^7.2.100",
     "@rails/activestorage": "^7.1.3",
-    "@rails/ujs": "^7.1.400",
+    "@rails/ujs": "^7.1.501",
     "@tailwindcss/forms": "^0.5.9",
-    "@tailwindcss/typography": "^0.5.15",
+    "@tailwindcss/typography": "^0.5.16",
     "autoprefixer": "^10.4.20",
-    "clipboard-polyfill": "^4.1.0",
+    "clipboard-polyfill": "^4.1.1",
     "lodash": "^4.17.19",
     "postcss": "^8.4.42",
     "postcss-cli": "^11.0.0",
     "postcss-import": "^16.1.0",
     "postcss-nesting": "^13.0.0",
-    "tailwindcss": "^3.4.10",
+    "tailwindcss": "^3.4.17",
     "trix": "^2.1.5",
     "turbolinks": "^5.2.0"
   },