From 094fb3d48b95f9273eb67911a546241a479c6015 Mon Sep 17 00:00:00 2001 From: clragon Date: Wed, 5 Feb 2025 19:59:20 +0100 Subject: [PATCH 1/2] [UserFeedbacks] Fix errors when restoring feedbacks from ancient mod actions (#894) --- db/fixes/123_convert_staffnote_to_deleted_feedback.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/db/fixes/123_convert_staffnote_to_deleted_feedback.rb b/db/fixes/123_convert_staffnote_to_deleted_feedback.rb index fe4f56196..420e05fa2 100755 --- a/db/fixes/123_convert_staffnote_to_deleted_feedback.rb +++ b/db/fixes/123_convert_staffnote_to_deleted_feedback.rb @@ -16,6 +16,9 @@ CurrentUser.as_system do record_id = mod_action.values["record_id"].to_i destroyed_feedback_ids << record_id + # old mod actions do not contain the necessary information. we skip them. + next if mod_action.values["type"].nil? || mod_action.values["reason"].nil? + { id: record_id, user_id: mod_action.values["user_id"].to_i, From 07020a6295258a158ef2040a36a82d63b89f0779 Mon Sep 17 00:00:00 2001 From: Cinder Date: Wed, 5 Feb 2025 10:59:31 -0800 Subject: [PATCH 2/2] [UI] Fix an issue causing a scrollbar to appear in the main menu (#893) --- app/javascript/src/styles/common/navigation.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/javascript/src/styles/common/navigation.scss b/app/javascript/src/styles/common/navigation.scss index 6e383dcd1..160d6001a 100644 --- a/app/javascript/src/styles/common/navigation.scss +++ b/app/javascript/src/styles/common/navigation.scss @@ -389,6 +389,7 @@ nav.navigation, html.nav-toggled nav.navigation { background: unset; height: unset; padding-left: 0.25rem; + overflow-y: unset; li a { border-bottom: 0; @@ -401,6 +402,7 @@ nav.navigation, html.nav-toggled nav.navigation { padding: 0 0.25rem; border-radius: 0.25rem 0 0 0.25rem; + overflow-y: unset; overflow: hidden; // Silly fix for too many links z-index: 1; // above the avatar