diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 18:09:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-20 18:09:36 +0300 |
commit | a5d7e614fe1d038a7f9e2af76106773b98e2b5e8 (patch) | |
tree | 4f8f59ace31f8e84a60f9512755a1efe0287a157 /app | |
parent | d00cd98a2b1b3f0899677f61257821c94cde8e31 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/clusters/forms/show/index.js | 3 | ||||
-rw-r--r-- | app/helpers/clusters_helper.rb | 6 | ||||
-rw-r--r-- | app/views/clusters/clusters/_integrations.html.haml | 16 | ||||
-rw-r--r-- | app/views/clusters/clusters/_integrations_tab.html.haml | 4 | ||||
-rw-r--r-- | app/views/clusters/clusters/show.html.haml | 1 |
5 files changed, 0 insertions, 30 deletions
diff --git a/app/assets/javascripts/clusters/forms/show/index.js b/app/assets/javascripts/clusters/forms/show/index.js index 102b240042f..3cb4376f41a 100644 --- a/app/assets/javascripts/clusters/forms/show/index.js +++ b/app/assets/javascripts/clusters/forms/show/index.js @@ -1,11 +1,8 @@ import Vue from 'vue'; -import dirtySubmitFactory from '~/dirty_submit/dirty_submit_factory'; import IntegrationForm from '../components/integration_form.vue'; import { createStore } from '../stores'; export default () => { - dirtySubmitFactory(document.querySelectorAll('.js-cluster-integrations-form')); - const entryPoint = document.querySelector('#js-cluster-details-form'); if (!entryPoint) { diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb index 458d81b3401..5c410a28229 100644 --- a/app/helpers/clusters_helper.rb +++ b/app/helpers/clusters_helper.rb @@ -57,12 +57,6 @@ module ClustersHelper render_if_exists 'clusters/clusters/environments' when 'apps' render 'applications' - when 'integrations' - if Feature.enabled?(:remove_monitor_metrics) - render('details', expanded: expanded) - else - render 'integrations' - end when 'settings' render 'advanced_settings_container' else diff --git a/app/views/clusters/clusters/_integrations.html.haml b/app/views/clusters/clusters/_integrations.html.haml deleted file mode 100644 index 4d36c5094a3..00000000000 --- a/app/views/clusters/clusters/_integrations.html.haml +++ /dev/null @@ -1,16 +0,0 @@ -.settings.expanded.border-0.m-0 - %p - = s_('ClusterIntegration|Integrations allow you to use applications installed in your cluster as part of your GitLab workflow.') - = link_to _('Learn more'), help_page_path('user/clusters/integrations.md'), target: '_blank', rel: 'noopener noreferrer' - .settings-content#integrations-settings-section - - if can?(current_user, :admin_cluster, @cluster) - .sub-section.form-group - = gitlab_ui_form_for @prometheus_integration, as: :integration, namespace: :prometheus, url: @cluster.integrations_path, method: :post, html: { class: 'js-cluster-integrations-form' } do |prometheus_form| - = prometheus_form.hidden_field :application_type, value: @prometheus_integration.application_type - .form-group.gl-form-group - - help_text = s_('ClusterIntegration|Allows GitLab to query a specifically configured in-cluster Prometheus for metrics.') - - help_link = link_to(_('More information.'), help_page_path("user/clusters/integrations"), target: '_blank', rel: 'noopener noreferrer') - = prometheus_form.gitlab_ui_checkbox_component :enabled, - s_('ClusterIntegration|Enable Prometheus integration'), - help_text: '%{help_text} %{help_link}'.html_safe % { help_text: help_text, help_link: help_link } - = prometheus_form.submit _('Save changes'), class: 'btn gl-button btn-confirm' diff --git a/app/views/clusters/clusters/_integrations_tab.html.haml b/app/views/clusters/clusters/_integrations_tab.html.haml deleted file mode 100644 index e229c1fbe1e..00000000000 --- a/app/views/clusters/clusters/_integrations_tab.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -- active = params[:tab] == 'integrations' - -= gl_tab_link_to clusterable.cluster_path(@cluster.id, params: { tab: 'integrations' }), { item_active: active } do - = _('Integrations') diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml index 57de6d980f8..1287f4e689f 100644 --- a/app/views/clusters/clusters/show.html.haml +++ b/app/views/clusters/clusters/show.html.haml @@ -32,7 +32,6 @@ = gl_tabs_nav do = render 'clusters/clusters/details_tab' = render_if_exists 'clusters/clusters/environments_tab' - = render 'clusters/clusters/integrations_tab' if !Feature.enabled?(:remove_monitor_metrics) = render 'clusters/clusters/advanced_settings_tab' .tab-content.py-3 |