From 83154f21542ec04076d20ce9c4a8997d55fc5f43 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 3 May 2017 15:42:29 +0200
Subject: [PATCH] Improve environment policy class

---
 app/policies/environment_policy.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/policies/environment_policy.rb b/app/policies/environment_policy.rb
index c0c9bbf2d9e..cc94d4a7e05 100644
--- a/app/policies/environment_policy.rb
+++ b/app/policies/environment_policy.rb
@@ -4,12 +4,14 @@ class EnvironmentPolicy < BasePolicy
   def rules
     delegate! environment.project
 
-    if environment.stop_action?
-      delegate! environment.stop_action
-    end
-
-    if can?(:create_deployment) && can?(:play_build)
-      can! :stop_environment
+    if can?(:create_deployment) && environment.stop_action?
+      can! :stop_environment if can_play_stop_action?
     end
   end
+
+  private
+
+  def can_play_stop_action?
+    Ability.allowed?(user, :play_build, environment.stop_action)
+  end
 end