diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-06-05 21:47:16 -0700 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-06-05 21:47:16 -0700 |
| commit | 3ba9a372e726bbd8d2a74aa697536d90db80255d (patch) | |
| tree | 313ec3aeba094b2fc2f9f19207a98675bea6c191 /app | |
| parent | 08d513a59e3cc2aa09b91217773267f3d3fd5653 (diff) | |
| download | gitlab-ce-3ba9a372e726bbd8d2a74aa697536d90db80255d.tar.gz | |
cleanup
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/clusters_helper.rb | 3 | ||||
| -rw-r--r-- | app/views/projects/clusters/_dropdown.html.haml | 12 |
2 files changed, 1 insertions, 14 deletions
diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb index e1be917f298..0663ef187e8 100644 --- a/app/helpers/clusters_helper.rb +++ b/app/helpers/clusters_helper.rb @@ -44,8 +44,7 @@ module ClustersHelper end def expires_at_in_session - @expires_at_in_session ||= - session[GoogleApi::CloudPlatform::Client.session_key_for_expires_at] + session[GoogleApi::CloudPlatform::Client.session_key_for_expires_at] end def valid_gcp_token diff --git a/app/views/projects/clusters/_dropdown.html.haml b/app/views/projects/clusters/_dropdown.html.haml deleted file mode 100644 index d55a9c60b64..00000000000 --- a/app/views/projects/clusters/_dropdown.html.haml +++ /dev/null @@ -1,12 +0,0 @@ -%h4.prepend-top-0= s_('ClusterIntegration|Choose how to set up Kubernetes cluster integration') - -.dropdown.clusters-dropdown - %button.dropdown-menu-toggle.dropdown-menu-full-width{ type: 'button', data: { toggle: 'dropdown' }, 'aria-haspopup': true, 'aria-expanded': false } - %span.dropdown-toggle-text - = dropdown_text - = icon('chevron-down') - %ul.dropdown-menu.clusters-dropdown-menu.dropdown-menu-full-width - %li - = link_to(s_('ClusterIntegration|Create Kubernetes cluster on Google Kubernetes Engine'), gcp_new_namespace_project_clusters_path(@project.namespace, @project)) - %li - = link_to(s_('ClusterIntegration|Add an existing Kubernetes cluster'), user_new_namespace_project_clusters_path(@project.namespace, @project)) |