From 2036071ddd7575fcdf031cce3d5ece311b21f84a Mon Sep 17 00:00:00 2001
From: Andy Smith <andy@37signals.com>
Date: Thu, 28 Aug 2025 12:22:48 -0500
Subject: [PATCH] Remove collection filtering where it's not needed

---
 app/controllers/accounts/settings_controller.rb      | 2 --
 app/controllers/collections_controller.rb            | 2 --
 app/controllers/notifications/settings_controller.rb | 2 --
 app/controllers/notifications_controller.rb          | 2 --
 app/controllers/users_controller.rb                  | 2 --
 app/controllers/workflows_controller.rb              | 2 --
 6 files changed, 12 deletions(-)

diff --git a/app/controllers/accounts/settings_controller.rb b/app/controllers/accounts/settings_controller.rb
index af8b47105..e915ad10c 100644
--- a/app/controllers/accounts/settings_controller.rb
+++ b/app/controllers/accounts/settings_controller.rb
@@ -1,8 +1,6 @@
 class Accounts::SettingsController < ApplicationController
   include FilterScoped
 
-  enable_collection_filtering only: :show
-
   def show
     @account = Account.sole
     @users = User.active
diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index cb3cfbdb0..285ca6964 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -3,8 +3,6 @@ class CollectionsController < ApplicationController
 
   include FilterScoped
 
-  enable_collection_filtering only: %i[ edit new ]
-
   def new
     @collection = Collection.new
   end
diff --git a/app/controllers/notifications/settings_controller.rb b/app/controllers/notifications/settings_controller.rb
index 6b1e5402a..5e9faea60 100644
--- a/app/controllers/notifications/settings_controller.rb
+++ b/app/controllers/notifications/settings_controller.rb
@@ -1,8 +1,6 @@
 class Notifications::SettingsController < ApplicationController
   include FilterScoped
 
-  enable_collection_filtering only: :show
-
   def show
     @collections = Current.user.collections.alphabetically
   end
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index a9c6f5e36..41446b2fb 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -1,8 +1,6 @@
 class NotificationsController < ApplicationController
   include FilterScoped
 
-  enable_collection_filtering only: :index
-
   def index
     @unread = Current.user.notifications.unread.ordered unless current_page_param
     set_page_and_extract_portion_from Current.user.notifications.read.ordered
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3b9c77f33..d066632bd 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -9,8 +9,6 @@ class UsersController < ApplicationController
   before_action :set_filter, only: %i[ edit show ]
   before_action :set_user_filtering, only: %i[ edit show]
 
-  enable_collection_filtering only: %i[ edit show ]
-
   def new
     @user = User.new
   end
diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb
index 63ea03305..24aab333b 100644
--- a/app/controllers/workflows_controller.rb
+++ b/app/controllers/workflows_controller.rb
@@ -3,8 +3,6 @@ class WorkflowsController < ApplicationController
 
   include FilterScoped
 
-  enable_collection_filtering only: %i[ new index ]
-
   def index
     @workflows = Workflow.all
   end