Merge branch 'main' into fix/submit-to-invalid

Gemfile

@@ -111,7 +111,7 @@ gem 'httparty', '~> 0.22.0'
 gem 'slack-notifier', '~> 2.4.0'
 
 # css styles for emails
-gem 'nokogiri', '~> 1.16.7'
+gem 'nokogiri', '~> 1.17.0'
 gem 'premailer-rails', '~> 1.12.0'
 
 # filtering
@@ -142,7 +142,7 @@ gem 'counter_culture', '~> 3.8'
 
 group :development, :test do
   # Use mocha for stubbing and mocking
-  gem 'mocha', '~> 2.6.1'
+  gem 'mocha', '~> 2.7.1'
   # Factory bot for factories
   gem 'factory_bot_rails', '~> 6.4.4'
 

Gemfile.lock

@@ -289,7 +289,7 @@ GEM
       minitest (>= 5.0.6)
     minitest-utils (0.4.8)
       minitest
-    mocha (2.6.1)
+    mocha (2.7.1)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.7.5)
     multi_json (1.15.0)
@@ -312,7 +312,7 @@ GEM
       net-protocol
     net-ssh (7.1.0)
     nio4r (2.7.4)
-    nokogiri (1.16.8-x86_64-linux)
+    nokogiri (1.17.0-x86_64-linux)
       racc (~> 1.4)
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
@@ -614,8 +614,8 @@ DEPENDENCIES
   memory_profiler (~> 1.1.0)
   minitest-ci (~> 3.4.0)
   minitest-utils (~> 0.4.8)
-  mocha (~> 2.6.1)
-  nokogiri (~> 1.16.7)
+  mocha (~> 2.7.1)
+  nokogiri (~> 1.17.0)
   omniauth-google-oauth2 (~> 1.2.0)
   omniauth-oauth2 (~> 1.8.0)
   omniauth-rails_csrf_protection (~> 1.0.2)

app/controllers/auth/omniauth_callbacks_controller.rb

@@ -235,7 +235,7 @@ def find_identity_by_uid
       identity = Identity.joins(:user).find_by(user: { first_name: auth_hash.info.first_name, last_name: auth_hash.info.last_name }, provider: provider, identifier_based_on_email: true) if identity.nil?
       return nil if identity.nil?
 
-      Event.new(event_type: :other, message: 'Office365 user signed in with legacy identifier').save!
+      Event.new(event_type: :other, message: 'Office365 user signed in with legacy identifier', user: identity.user).save!
 
       # Update the identifier to the new uid
       identity.update(identifier: auth_uid, identifier_based_on_email: false)
@@ -251,7 +251,7 @@ def find_identity_by_uid
       identity = Identity.joins(:user).find_by(user: { first_name: auth_hash.info.first_name, last_name: auth_hash.info.last_name }, provider: provider, identifier_based_on_username: true) if identity.nil?
       return nil if identity.nil?
 
-      Event.new(event_type: :other, message: 'Smartschool user signed in with legacy identifier').save!
+      Event.new(event_type: :other, message: 'Smartschool user signed in with legacy identifier', user: identity.user).save!
 
       # Update the identifier to the new uid
       identity.update(identifier: auth_uid, identifier_based_on_username: false)

package.json

@@ -19,8 +19,8 @@
     "@codemirror/commands": "^6.7.1",
     "@codemirror/language": "^6.10.6",
     "@codemirror/language-data": "^6.5.1",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.35.0",
+    "@codemirror/state": "^6.5.0",
+    "@codemirror/view": "^6.35.2",
     "@dodona/papyros": "2.3.7",
     "@iframe-resizer/child": "^5.3.2",
     "@iframe-resizer/parent": "^5.3.2",
@@ -31,8 +31,8 @@
     "@rails/activestorage": "^7.2.102",
     "@rails/ujs": "^7.1.402",
     "@replit/codemirror-lang-csharp": "^6.2.0",
-    "@sentry/browser": "^8.41.0",
-    "@sentry/webpack-plugin": "^2.22.6",
+    "@sentry/browser": "^8.42.0",
+    "@sentry/webpack-plugin": "^2.22.7",
     "@types/bootstrap": "^5.2.10",
     "@types/d3": "^7.4.3",
     "@types/dragula": "^3.7.5",
@@ -54,18 +54,18 @@
     "glightbox": "^3.2.0",
     "lit": "^3.2.1",
     "node-polyglot": "^2.6.0",
-    "sass": "^1.81.0",
+    "sass": "^1.82.0",
     "tippy.js": "^6.3.7",
     "ts-loader": "^9.5.1",
     "typescript": "^5.7.2",
-    "webpack": "^5.96.1",
+    "webpack": "^5.97.1",
     "webpack-cli": "^5.1.4"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.0.2",
     "@eslint/js": "^9.15.0",
     "@open-wc/testing-helpers": "^3.0.1",
-    "@stylistic/eslint-plugin": "^2.11.0",
+    "@stylistic/eslint-plugin": "^2.12.0",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/user-event": "^14.5.2",
     "@webcomponents/scoped-custom-element-registry": "^0.0.9",
@@ -86,7 +86,7 @@
     "stylelint-config-standard": "^34.0.0",
     "stylelint-config-standard-scss": "^11.1.0",
     "ts-jest": "^26.5.6",
-    "typescript-eslint": "^8.16.0",
+    "typescript-eslint": "^8.17.0",
     "webpack-bundle-analyzer": "^4.10.2"
   },
   "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"