summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-11-06 15:19:23 -0600
committerThong Kuah <tkuah@gitlab.com>2018-11-08 23:28:30 +1300
commit83b8321aeab33e8814c717625a592ffb1e27bd44 (patch)
tree2a2e5557e9d371cd786f4705011541f318fe4714
parent82391594e3cb4afa0853b732bd076dc21d62af28 (diff)
downloadgitlab-ce-83b8321aeab33e8814c717625a592ffb1e27bd44.tar.gz
Rename is_project? to project?
-rw-r--r--app/presenters/clusterable_presenter.rb2
-rw-r--r--app/presenters/group_clusterable_presenter.rb2
-rw-r--r--app/presenters/project_clusterable_presenter.rb2
-rw-r--r--app/views/clusters/clusters/_empty_state.html.haml2
-rw-r--r--app/views/clusters/clusters/_sidebar.html.haml2
5 files changed, 5 insertions, 5 deletions
diff --git a/app/presenters/clusterable_presenter.rb b/app/presenters/clusterable_presenter.rb
index 9cc93d7f0c6..6de967a58e9 100644
--- a/app/presenters/clusterable_presenter.rb
+++ b/app/presenters/clusterable_presenter.rb
@@ -44,7 +44,7 @@ class ClusterablePresenter < Gitlab::View::Presenter::Delegated
raise NotImplementedError
end
- def is_project?
+ def project?
raise NotImplementedError
end
end
diff --git a/app/presenters/group_clusterable_presenter.rb b/app/presenters/group_clusterable_presenter.rb
index 5a893559f12..6da4dbfeaa4 100644
--- a/app/presenters/group_clusterable_presenter.rb
+++ b/app/presenters/group_clusterable_presenter.rb
@@ -13,7 +13,7 @@ class GroupClusterablePresenter < ClusterablePresenter
group_cluster_path(clusterable, cluster, params)
end
- def is_project?
+ def project?
false
end
end
diff --git a/app/presenters/project_clusterable_presenter.rb b/app/presenters/project_clusterable_presenter.rb
index 4b74c9beb95..2aea31e8bbf 100644
--- a/app/presenters/project_clusterable_presenter.rb
+++ b/app/presenters/project_clusterable_presenter.rb
@@ -13,7 +13,7 @@ class ProjectClusterablePresenter < ClusterablePresenter
project_cluster_path(clusterable, cluster, params)
end
- def is_project?
+ def project?
true
end
end
diff --git a/app/views/clusters/clusters/_empty_state.html.haml b/app/views/clusters/clusters/_empty_state.html.haml
index 4e739e86edf..b155ce056be 100644
--- a/app/views/clusters/clusters/_empty_state.html.haml
+++ b/app/views/clusters/clusters/_empty_state.html.haml
@@ -7,7 +7,7 @@
- link_to_help_page = link_to(_('Learn more about Kubernetes'), help_page_path('user/project/clusters/index'), target: '_blank', rel: 'noopener noreferrer')
%p
= s_('ClusterIntegration|Kubernetes clusters allow you to use review apps, deploy your applications, run your pipelines, and much more in an easy way.')
- - if clusterable.is_project?
+ - if clusterable.project?
= link_to(s_('ClusterIntegration|Learn more about Kubernetes'), help_page_path('user/project/clusters/index'), target: '_blank', rel: 'noopener noreferrer')
- else
= s_('ClusterIntegration|Adding an integration to your group will share the cluster across all your projects.')
diff --git a/app/views/clusters/clusters/_sidebar.html.haml b/app/views/clusters/clusters/_sidebar.html.haml
index 5f941f6cf0e..66cda3ee83b 100644
--- a/app/views/clusters/clusters/_sidebar.html.haml
+++ b/app/views/clusters/clusters/_sidebar.html.haml
@@ -3,7 +3,7 @@
- help_link_end = '</a>'.html_safe
%h4.prepend-top-0
= s_('ClusterIntegration|Add a Kubernetes cluster integration')
-- if clusterable.is_project?
+- if clusterable.project?
%p
= s_('ClusterIntegration|With a Kubernetes cluster associated to this project, you can use review apps, deploy your applications, run your pipelines, and much more in an easy way.')
%p