Merge remote-tracking branch 'origin/main' into feature/055

backend/app/controllers/materials_controller.rb

@@ -237,8 +237,8 @@ class MaterialsController < ApplicationController
   end
 
   def resolve_material_tag! locale, tag_name_raw
-    tag_name = TagName.find_undiscard_or_create_by!(language_code: locale.language_code,
-                                                    name: tag_name_raw)
+    tag_name = TagName.find_or_create_by!(language_code: locale.language_code,
+                                          name: tag_name_raw)
     tag_name.tag || Tag.create!(tag_name:, category: :material)
   end