summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorMayra Cabrera <mcabrera@gitlab.com>2019-02-05 13:11:33 -0600
committerMayra Cabrera <mcabrera@gitlab.com>2019-02-06 21:51:48 -0600
commitd9af3752fcfa6e97bcec82515b0cbc1ab88285de (patch)
tree61e1e650e5e7671f5d38b7acc1940c20e3c677e4 /app/helpers
parent087af654bbae1e4a843029b33e1aab546f4d7d61 (diff)
downloadgitlab-ce-d9af3752fcfa6e97bcec82515b0cbc1ab88285de.tar.gz
Addresses UX and BE comments:52363-ui-changes-to-cluster-and-ado-pages
- Changes help text on clusters form to make it more explicit. - Removes unnecessary warnings on auto devops form - Simplifies cluster methods logic
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/auto_devops_helper.rb26
1 files changed, 0 insertions, 26 deletions
diff --git a/app/helpers/auto_devops_helper.rb b/app/helpers/auto_devops_helper.rb
index 8628c90dc51..67e7e475920 100644
--- a/app/helpers/auto_devops_helper.rb
+++ b/app/helpers/auto_devops_helper.rb
@@ -9,30 +9,4 @@ module AutoDevopsHelper
!project.repository.gitlab_ci_yml &&
!project.ci_service
end
-
- def auto_devops_warning_message(project)
- if missing_auto_devops_service?(project)
- params = {
- kubernetes: link_to('Kubernetes cluster', project_clusters_path(project))
- }
-
- if missing_auto_devops_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_auto_devops_domain?(project)
- _('Auto Review Apps and Auto Deploy need a domain name to work correctly.')
- end
- end
-
- private
-
- def missing_auto_devops_domain?(project)
- !(project.auto_devops || project.build_auto_devops)&.has_domain?
- end
-
- def missing_auto_devops_service?(project)
- !project.deployment_platform&.active?
- end
end