Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-02-02 03:21:56 +0300
committerMatija Čupić <matteeyah@gmail.com>2018-02-02 03:21:56 +0300
commitc120b7a1fe575766c000e8e49387e1ef05671cda (patch)
tree9d44e8a553ce172f75715fc2c54366033ce20537 /app/helpers/auto_devops_helper.rb
parente5ee1d6a29510125ae836720efd7f9127cff3032 (diff)
Fix AutoDevOpsHelper helper methods
Diffstat (limited to 'app/helpers/auto_devops_helper.rb')
-rw-r--r--app/helpers/auto_devops_helper.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/helpers/auto_devops_helper.rb b/app/helpers/auto_devops_helper.rb
index 898ad2d304b..fa65ddf6b03 100644
--- a/app/helpers/auto_devops_helper.rb
+++ b/app/helpers/auto_devops_helper.rb
@@ -9,28 +9,28 @@ module AutoDevopsHelper
end
def auto_devops_warning_message(project)
- if missing_service?
+ if missing_service?(project)
params = {
kubernetes: link_to('Kubernetes cluster', project_clusters_path(project))
}
- if missing_domain?
+ if missing_domain?(project)
_('Auto Review Apps and Auto Deploy need a domain name and a %{kubernetes} to work correctly.') % params
else
_('Auto Review Apps and Auto Deploy need a %{kubernetes} to work correctly.') % params
end
- elsif missing_domain?
+ elsif missing_domain?(project)
_('Auto Review Apps and Auto Deploy need a domain name to work correctly.')
end
end
private
- def missing_domain?
+ def missing_domain?(project)
!(project.auto_devops&.has_domain? || current_application_settings.auto_devops_domain.present?)
end
- def missing_service?
+ def missing_service?(project)
!project.deployment_platform&.active?
end
end