Add latest changes from gitlab-org/gitlab@16-3-stable-eev16.3.0-rc42

2 files changed, 4 insertions, 5 deletions

diff --git a/app/controllers/profiles/notifications_controller.rb b/app/controllers/profiles/notifications_controller.rb
index 1477f8e0aac..02f7dbf8e6f 100644
--- a/app/controllers/profiles/notifications_controller.rb
+++ b/app/controllers/profiles/notifications_controller.rb
@@ -45,7 +45,7 @@ class Profiles::NotificationsController < Profiles::ApplicationController
     projects = project_notifications.map(&:source)
     ActiveRecord::Associations::Preloader.new(
       records: projects,
-      associations: { namespace: [:route, :owner], group: [], creator: [] }
+      associations: { namespace: [:route, :owner], group: [], creator: [], project_setting: [] }
     ).call
     Preloaders::UserMaxAccessLevelInProjectsPreloader.new(projects, current_user).execute
 
diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb
index f19113276c2..3e8555a4ed1 100644
--- a/app/controllers/profiles/preferences_controller.rb
+++ b/app/controllers/profiles/preferences_controller.rb
@@ -37,7 +37,7 @@ class Profiles::PreferencesController < Profiles::ApplicationController
   end
 
   def preferences_param_names
-    preferences_param_names = [
+    [
       :color_scheme_id,
       :diffs_deletion_color,
       :diffs_addition_color,
@@ -57,10 +57,9 @@ class Profiles::PreferencesController < Profiles::ApplicationController
       :project_shortcut_buttons,
       :markdown_surround_selection,
       :markdown_automatic_lists,
-      :use_new_navigation
+      :use_new_navigation,
+      :enabled_following
     ]
-    preferences_param_names << :enabled_following if ::Feature.enabled?(:disable_follow_users, user)
-    preferences_param_names
   end
 end