diff options
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/clusters/_advanced_settings.html.haml (renamed from app/views/projects/clusters/_advanced_settings.html.haml) | 0 | ||||
-rw-r--r-- | app/views/clusters/_banner.html.haml (renamed from app/views/projects/clusters/_banner.html.haml) | 0 | ||||
-rw-r--r-- | app/views/clusters/_cluster.html.haml (renamed from app/views/projects/clusters/_cluster.html.haml) | 0 | ||||
-rw-r--r-- | app/views/clusters/_empty_state.html.haml (renamed from app/views/projects/clusters/_empty_state.html.haml) | 0 | ||||
-rw-r--r-- | app/views/clusters/_gcp_signup_offer_banner.html.haml (renamed from app/views/projects/clusters/_gcp_signup_offer_banner.html.haml) | 0 | ||||
-rw-r--r-- | app/views/clusters/_integration_form.html.haml (renamed from app/views/projects/clusters/_integration_form.html.haml) | 0 | ||||
-rw-r--r-- | app/views/clusters/_sidebar.html.haml (renamed from app/views/projects/clusters/_sidebar.html.haml) | 0 | ||||
-rw-r--r-- | app/views/clusters/gcp/_form.html.haml (renamed from app/views/projects/clusters/gcp/_form.html.haml) | 0 | ||||
-rw-r--r-- | app/views/clusters/gcp/_header.html.haml (renamed from app/views/projects/clusters/gcp/_header.html.haml) | 0 | ||||
-rw-r--r-- | app/views/clusters/gcp/_show.html.haml (renamed from app/views/projects/clusters/gcp/_show.html.haml) | 0 | ||||
-rw-r--r-- | app/views/clusters/index.html.haml (renamed from app/views/projects/clusters/index.html.haml) | 0 | ||||
-rw-r--r-- | app/views/clusters/new.html.haml (renamed from app/views/projects/clusters/new.html.haml) | 8 | ||||
-rw-r--r-- | app/views/clusters/show.html.haml (renamed from app/views/projects/clusters/show.html.haml) | 4 | ||||
-rw-r--r-- | app/views/clusters/user/_form.html.haml (renamed from app/views/projects/clusters/user/_form.html.haml) | 0 | ||||
-rw-r--r-- | app/views/clusters/user/_header.html.haml (renamed from app/views/projects/clusters/user/_header.html.haml) | 0 | ||||
-rw-r--r-- | app/views/clusters/user/_show.html.haml (renamed from app/views/projects/clusters/user/_show.html.haml) | 0 |
16 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/clusters/_advanced_settings.html.haml b/app/views/clusters/_advanced_settings.html.haml index 243e8cd9ba0..243e8cd9ba0 100644 --- a/app/views/projects/clusters/_advanced_settings.html.haml +++ b/app/views/clusters/_advanced_settings.html.haml diff --git a/app/views/projects/clusters/_banner.html.haml b/app/views/clusters/_banner.html.haml index 73cfea0ef92..73cfea0ef92 100644 --- a/app/views/projects/clusters/_banner.html.haml +++ b/app/views/clusters/_banner.html.haml diff --git a/app/views/projects/clusters/_cluster.html.haml b/app/views/clusters/_cluster.html.haml index 2d7f7c6b1fb..2d7f7c6b1fb 100644 --- a/app/views/projects/clusters/_cluster.html.haml +++ b/app/views/clusters/_cluster.html.haml diff --git a/app/views/projects/clusters/_empty_state.html.haml b/app/views/clusters/_empty_state.html.haml index b8a3556a206..b8a3556a206 100644 --- a/app/views/projects/clusters/_empty_state.html.haml +++ b/app/views/clusters/_empty_state.html.haml diff --git a/app/views/projects/clusters/_gcp_signup_offer_banner.html.haml b/app/views/clusters/_gcp_signup_offer_banner.html.haml index 73b11d509d3..73b11d509d3 100644 --- a/app/views/projects/clusters/_gcp_signup_offer_banner.html.haml +++ b/app/views/clusters/_gcp_signup_offer_banner.html.haml diff --git a/app/views/projects/clusters/_integration_form.html.haml b/app/views/clusters/_integration_form.html.haml index d0a553e3414..d0a553e3414 100644 --- a/app/views/projects/clusters/_integration_form.html.haml +++ b/app/views/clusters/_integration_form.html.haml diff --git a/app/views/projects/clusters/_sidebar.html.haml b/app/views/clusters/_sidebar.html.haml index 3d10348212f..3d10348212f 100644 --- a/app/views/projects/clusters/_sidebar.html.haml +++ b/app/views/clusters/_sidebar.html.haml diff --git a/app/views/projects/clusters/gcp/_form.html.haml b/app/views/clusters/gcp/_form.html.haml index 171ceeceb68..171ceeceb68 100644 --- a/app/views/projects/clusters/gcp/_form.html.haml +++ b/app/views/clusters/gcp/_form.html.haml diff --git a/app/views/projects/clusters/gcp/_header.html.haml b/app/views/clusters/gcp/_header.html.haml index a2ad3cd64df..a2ad3cd64df 100644 --- a/app/views/projects/clusters/gcp/_header.html.haml +++ b/app/views/clusters/gcp/_header.html.haml diff --git a/app/views/projects/clusters/gcp/_show.html.haml b/app/views/clusters/gcp/_show.html.haml index 779c9c245c1..779c9c245c1 100644 --- a/app/views/projects/clusters/gcp/_show.html.haml +++ b/app/views/clusters/gcp/_show.html.haml diff --git a/app/views/projects/clusters/index.html.haml b/app/views/clusters/index.html.haml index a55de84b5cd..a55de84b5cd 100644 --- a/app/views/projects/clusters/index.html.haml +++ b/app/views/clusters/index.html.haml diff --git a/app/views/projects/clusters/new.html.haml b/app/views/clusters/new.html.haml index a38003f5750..57cdbcd2d38 100644 --- a/app/views/projects/clusters/new.html.haml +++ b/app/views/clusters/new.html.haml @@ -19,9 +19,9 @@ .tab-content.gitlab-tab-content .tab-pane{ id: 'create-gcp-cluster-pane', class: active_when(active_tab == 'gcp'), role: 'tabpanel' } - = render 'projects/clusters/gcp/header' + = render 'clusters/gcp/header' - if @valid_gcp_token - = render 'projects/clusters/gcp/form' + = render 'clusters/gcp/form' - elsif @authorize_url .signin-with-google = link_to(image_tag('auth_buttons/signin_with_google.png', width: '191px'), @authorize_url) @@ -32,5 +32,5 @@ = s_('Google authentication is not %{link_to_documentation}. Ask your GitLab administrator if you want to use this service.').html_safe % { link_to_documentation: link } .tab-pane{ id: 'add-user-cluster-pane', class: active_when(active_tab == 'user'), role: 'tabpanel' } - = render 'projects/clusters/user/header' - = render 'projects/clusters/user/form' + = render 'clusters/user/header' + = render 'clusters/user/form' diff --git a/app/views/projects/clusters/show.html.haml b/app/views/clusters/show.html.haml index eddd3613c5f..14416303827 100644 --- a/app/views/projects/clusters/show.html.haml +++ b/app/views/clusters/show.html.haml @@ -38,9 +38,9 @@ %p= s_('ClusterIntegration|See and edit the details for your Kubernetes cluster') .settings-content - if @cluster.managed? - = render 'projects/clusters/gcp/show' + = render 'clusters/gcp/show' - else - = render 'projects/clusters/user/show' + = render 'clusters/user/show' %section.settings.no-animate#js-cluster-advanced-settings{ class: ('expanded' if expanded) } .settings-header diff --git a/app/views/projects/clusters/user/_form.html.haml b/app/views/clusters/user/_form.html.haml index 54a6e685bb0..54a6e685bb0 100644 --- a/app/views/projects/clusters/user/_form.html.haml +++ b/app/views/clusters/user/_form.html.haml diff --git a/app/views/projects/clusters/user/_header.html.haml b/app/views/clusters/user/_header.html.haml index 749177fa6c1..749177fa6c1 100644 --- a/app/views/projects/clusters/user/_header.html.haml +++ b/app/views/clusters/user/_header.html.haml diff --git a/app/views/projects/clusters/user/_show.html.haml b/app/views/clusters/user/_show.html.haml index 5b57f7ceb7d..5b57f7ceb7d 100644 --- a/app/views/projects/clusters/user/_show.html.haml +++ b/app/views/clusters/user/_show.html.haml |