Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42

1 files changed, 1 insertions, 6 deletions

diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 34e0b528ced..e8a48d6c9f4 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -182,8 +182,6 @@ module API
           [options[:with].prepare_relation(projects, options), options]
         end
 
-        Preloaders::UserMaxAccessLevelInProjectsPreloader.new(records, current_user).execute if current_user
-
         present records, options
       end
 
@@ -658,10 +656,7 @@ module API
         users = DeclarativePolicy.subject_scope { user_project.team.users }
         users = users.search(params[:search]) if params[:search].present?
         users = users.where_not_in(params[:skip_users]) if params[:skip_users].present?
-
-        if Feature.enabled?(:sort_by_project_users_by_project_authorizations_user_id, user_project, default_enabled: :yaml)
-          users = users.order('project_authorizations.user_id' => :asc) # rubocop: disable CodeReuse/ActiveRecord
-        end
+        users = users.order('project_authorizations.user_id' => :asc) # rubocop: disable CodeReuse/ActiveRecord
 
         present paginate(users), with: Entities::UserBasic
       end