From e4bf776a8829e5186a0f63603c0be627b891d80e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 23 Mar 2020 09:09:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/admin/serverless/domains_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/admin/serverless/domains_controller.rb b/app/controllers/admin/serverless/domains_controller.rb index 9741a0716f2..1d4f10e033f 100644 --- a/app/controllers/admin/serverless/domains_controller.rb +++ b/app/controllers/admin/serverless/domains_controller.rb @@ -9,7 +9,7 @@ class Admin::Serverless::DomainsController < Admin::ApplicationController end def create - if PagesDomain.instance_serverless.count > 0 + if PagesDomain.instance_serverless.exists? return redirect_to admin_serverless_domains_path, notice: _('An instance-level serverless domain already exists.') end @@ -31,7 +31,7 @@ class Admin::Serverless::DomainsController < Admin::ApplicationController end def destroy - if domain.serverless_domain_clusters.count > 0 + if domain.serverless_domain_clusters.exists? return redirect_to admin_serverless_domains_path, status: :conflict, notice: _('Domain cannot be deleted while associated to one or more clusters.') -- cgit v1.2.1