From 69f0a9d33ead23e65f7a666e67ec92019fec0d02 Mon Sep 17 00:00:00 2001 From: Ana Rosas Date: Tue, 28 Jun 2016 11:35:47 -0700 Subject: [PATCH] Add enable_for_all? condition --- lib/travis/api/app/endpoint/builds.rb | 4 ++-- lib/travis/api/app/endpoint/jobs.rb | 4 ++-- lib/travis/api/v3/queries/build.rb | 4 ++-- lib/travis/api/v3/queries/job.rb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/travis/api/app/endpoint/builds.rb b/lib/travis/api/app/endpoint/builds.rb index fd4b890b..923c712a 100644 --- a/lib/travis/api/app/endpoint/builds.rb +++ b/lib/travis/api/app/endpoint/builds.rb @@ -25,7 +25,7 @@ class Travis::Api::App service = Travis::Enqueue::Services::CancelModel.new(current_user, { build_id: params[:id] }) repository_owner = service.target.repository.owner - if !Travis::Features.owner_active?(:enqueue_to_hub, repository_owner) + if !Travis::Features.enabled_for_all?(:enqueue_to_hub) && !Travis::Features.owner_active?(:enqueue_to_hub, repository_owner) service = self.service(:cancel_build, params.merge(source: 'api')) end @@ -64,7 +64,7 @@ class Travis::Api::App service = Travis::Enqueue::Services::RestartModel.new(current_user, build_id: params[:id]) repository_owner = service.target.repository.owner - if !Travis::Features.owner_active?(:enqueue_to_hub, repository_owner) + if !Travis::Features.enabled_for_all?(:enqueue_to_hub) && !Travis::Features.owner_active?(:enqueue_to_hub, repository_owner) service = self.service(:reset_model, build_id: params[:id]) end diff --git a/lib/travis/api/app/endpoint/jobs.rb b/lib/travis/api/app/endpoint/jobs.rb index 410c76e4..aafef56c 100644 --- a/lib/travis/api/app/endpoint/jobs.rb +++ b/lib/travis/api/app/endpoint/jobs.rb @@ -31,7 +31,7 @@ class Travis::Api::App service = Travis::Enqueue::Services::CancelModel.new(current_user, { job_id: params[:id] }) repository_owner = service.target.repository.owner - if !Travis::Features.owner_active?(:enqueue_to_hub, repository_owner) + if !Travis::Features.enabled_for_all?(:enqueue_to_hub) && !Travis::Features.owner_active?(:enqueue_to_hub, repository_owner) service = self.service(:cancel_job, params.merge(source: 'api')) end @@ -70,7 +70,7 @@ class Travis::Api::App service = Travis::Enqueue::Services::RestartModel.new(current_user, { job_id: params[:id] }) repository_owner = service.target.repository.owner - if !Travis::Features.owner_active?(:enqueue_to_hub, repository_owner) + if !Travis::Features.enabled_for_all?(:enqueue_to_hub) && !Travis::Features.owner_active?(:enqueue_to_hub, repository_owner) service = self.service(:reset_model, job_id: params[:id]) end diff --git a/lib/travis/api/v3/queries/build.rb b/lib/travis/api/v3/queries/build.rb index 803392ce..8133d54c 100644 --- a/lib/travis/api/v3/queries/build.rb +++ b/lib/travis/api/v3/queries/build.rb @@ -13,7 +13,7 @@ module Travis::API::V3 def cancel(user) raise BuildNotCancelable if %w(passed failed canceled errored).include? find.state payload = { id: id, user_id: user.id, source: 'api' } - if Travis::Features.owner_active?(:enqueue_to_hub, find.repository.owner) + if Travis::Features.enabled_for_all?(:enqueue_to_hub) || Travis::Features.owner_active?(:enqueue_to_hub, find.repository.owner) service = Travis::Enqueue::Services::CancelModel.new(user, { build_id: id }) service.push("build:cancel", payload) else @@ -24,7 +24,7 @@ module Travis::API::V3 def restart(user) raise BuildAlreadyRunning if %w(received queued started).include? find.state - if Travis::Features.owner_active?(:enqueue_to_hub, find.repository.owner) + if Travis::Features.enabled_for_all?(:enqueue_to_hub) || Travis::Features.owner_active?(:enqueue_to_hub, find.repository.owner) service = Travis::Enqueue::Services::RestartModel.new(user, { build_id: id }) payload = { id: id, user_id: user.id } service.push("build:restart", payload) diff --git a/lib/travis/api/v3/queries/job.rb b/lib/travis/api/v3/queries/job.rb index fc7eb899..755ab069 100644 --- a/lib/travis/api/v3/queries/job.rb +++ b/lib/travis/api/v3/queries/job.rb @@ -14,7 +14,7 @@ module Travis::API::V3 raise JobNotCancelable if %w(passed failed canceled errored).include? find.state payload = { id: id, user_id: user.id, source: 'api' } #look for repo.owner instead and look if the user belongs to the repo, instead of using user for the feature flag - if Travis::Features.owner_active?(:enqueue_to_hub, find.repository.owner) + if Travis::Features.enabled_for_all?(:enqueue_to_hub) || Travis::Features.owner_active?(:enqueue_to_hub, find.repository.owner) service = Travis::Enqueue::Services::CancelModel.new(user, { job_id: id }) service.push("job:cancel", payload) else @@ -26,7 +26,7 @@ module Travis::API::V3 def restart(user) raise JobAlreadyRunning if %w(received queued started).include? find.state - if Travis::Features.owner_active?(:enqueue_to_hub, find.repository.owner) + if Travis::Features.enabled_for_all?(:enqueue_to_hub) || Travis::Features.owner_active?(:enqueue_to_hub, find.repository.owner) service = Travis::Enqueue::Services::RestartModel.new(user, { job_id: id }) payload = { id: id, user_id: user.id } service.push("job:restart", payload)