Move permission check before more expensive checks

1 files changed, 5 insertions, 3 deletions

diff --git a/app/finders/environments_finder.rb b/app/finders/environments_finder.rb
index 2f1a09fcb55..a59f8c1efa3 100644
--- a/app/finders/environments_finder.rb
+++ b/app/finders/environments_finder.rb
@@ -24,6 +24,10 @@ class EnvironmentsFinder
     environments = project.environments.available
       .where(id: environment_ids).order_by_last_deployed_at.to_a
 
+    environments.select! do |environment|
+      Ability.allowed?(current_user, :read_environment, environment)
+    end
+
     if ref && commit
       environments.select! do |environment|
         environment.includes_commit?(commit)
@@ -36,9 +40,7 @@ class EnvironmentsFinder
       end
     end
 
-    environments.select do |environment|
-      Ability.allowed?(current_user, :read_environment, environment)
-    end
+    environments
   end
 
   private