Commit ea69379b authored by Daniel Gerhardt's avatar Daniel Gerhardt

Disable clusters and Auto DevOps for project CI for now

We cannot support these features at this time and they are just
cluttering the UI.
parent fc45c1f2
...@@ -360,7 +360,7 @@ module ProjectsHelper ...@@ -360,7 +360,7 @@ module ProjectsHelper
snippets: :read_project_snippet, snippets: :read_project_snippet,
settings: :admin_project, settings: :admin_project,
builds: :read_build, builds: :read_build,
clusters: :read_cluster, #clusters: :read_cluster,
serverless: :read_cluster, serverless: :read_cluster,
error_tracking: :read_sentry_issue, error_tracking: :read_sentry_issue,
labels: :read_label, labels: :read_label,
......
...@@ -256,6 +256,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated ...@@ -256,6 +256,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
end end
def autodevops_anchor_data(show_auto_devops_callout: false) def autodevops_anchor_data(show_auto_devops_callout: false)
return
if current_user && can?(current_user, :admin_pipeline, project) && repository.gitlab_ci_yml.blank? && !show_auto_devops_callout if current_user && can?(current_user, :admin_pipeline, project) && repository.gitlab_ci_yml.blank? && !show_auto_devops_callout
if auto_devops_enabled? if auto_devops_enabled?
AnchorData.new(false, AnchorData.new(false,
...@@ -275,6 +276,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated ...@@ -275,6 +276,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated
end end
def kubernetes_cluster_anchor_data def kubernetes_cluster_anchor_data
return
if current_user && can?(current_user, :create_cluster, project) if current_user && can?(current_user, :create_cluster, project)
if clusters.empty? if clusters.empty?
......
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
.settings-content .settings-content
= render 'form' = render 'form'
%section.qa-autodevops-settings.settings#autodevops-settings.no-animate{ class: ('expanded' if expanded) } /
%section.qa-autodevops-settings.settings#autodevops-settings.no-animate{ class: ('expanded' if expanded) }
.settings-header .settings-header
%h4 %h4
= s_('CICD|Auto DevOps') = s_('CICD|Auto DevOps')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment