Merge branch 'master' into master2

[UI] Fix an issue causing a scrollbar to appear in the main menu (#893 )
[UserFeedbacks] Fix errors when restoring feedbacks from ancient mod actions (#894 )
2025-02-06 12:53:56 -06:00 · 2025-02-05 10:59:31 -08:00 · 2025-02-05 10:59:20 -08:00
2 changed files with 5 additions and 0 deletions
--- 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
--- 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,
Author	SHA1	Message	Date
edshot99	f705938b8d	Merge branch 'master' into master2	2025-02-06 12:53:56 -06:00
Cinder	07020a6295	[UI] Fix an issue causing a scrollbar to appear in the main menu (#893 )	2025-02-05 10:59:31 -08:00
clragon	094fb3d48b	[UserFeedbacks] Fix errors when restoring feedbacks from ancient mod actions (#894 )	2025-02-05 10:59:20 -08:00