From 8116e400be83997206b1ed12534d3a71ae4b6333 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Tue, 7 Feb 2017 11:26:59 -0600 Subject: Don't skip authorization when stopping CI environments --- app/finders/environments_finder.rb | 10 +++------- app/services/ci/stop_environments_service.rb | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/app/finders/environments_finder.rb b/app/finders/environments_finder.rb index 5c798a75945..2f1a09fcb55 100644 --- a/app/finders/environments_finder.rb +++ b/app/finders/environments_finder.rb @@ -5,7 +5,7 @@ class EnvironmentsFinder @project, @current_user, @params = project, current_user, params end - def execute(skip_authorization: false) + def execute deployments = project.deployments deployments = if ref @@ -36,13 +36,9 @@ class EnvironmentsFinder end end - unless skip_authorization - environments.select! do |environment| - Ability.allowed?(current_user, :read_environment, environment) - end + environments.select do |environment| + Ability.allowed?(current_user, :read_environment, environment) end - - environments end private diff --git a/app/services/ci/stop_environments_service.rb b/app/services/ci/stop_environments_service.rb index 8333f4c6d85..d63bafd682a 100644 --- a/app/services/ci/stop_environments_service.rb +++ b/app/services/ci/stop_environments_service.rb @@ -23,7 +23,7 @@ module Ci def environments @environments ||= - EnvironmentsFinder.new(project, nil, ref: @ref, recently_updated: true).execute(skip_authorization: true) + EnvironmentsFinder.new(project, current_user, ref: @ref, recently_updated: true).execute end end end -- cgit v1.2.1