Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 9 deletions

diff --git a/app/views/projects/services/_form.html.haml b/app/views/projects/services/_form.html.haml
index bd9defe5f74..0dbd6a48ec5 100644
--- a/app/views/projects/services/_form.html.haml
+++ b/app/views/projects/services/_form.html.haml
@@ -12,11 +12,10 @@
   .col-lg-9
     = form_for(@service, as: :service, url: scoped_integration_path(@service), method: :put, html: { class: 'gl-show-field-errors integration-settings-form js-integration-settings-form', data: { 'can-test' => @service.can_test?, 'test-url' => test_project_service_path(@project, @service) } }) do |form|
       = render 'shared/service_settings', form: form, service: @service
-      - if @service.editable?
-        .footer-block.row-content-block
-          = service_save_button(@service)
-           
-          = link_to _('Cancel'), project_settings_integrations_path(@project), class: 'btn btn-cancel'
+      .footer-block.row-content-block
+        = service_save_button(@service)
+         
+        = link_to _('Cancel'), project_settings_integrations_path(@project), class: 'btn btn-cancel'
 
 - if lookup_context.template_exists?('show', "projects/services/#{@service.to_param}", true)
   %hr
diff --git a/app/views/projects/services/prometheus/_help.html.haml b/app/views/projects/services/prometheus/_help.html.haml
index 35d655e4b32..1b5b794a7aa 100644
--- a/app/views/projects/services/prometheus/_help.html.haml
+++ b/app/views/projects/services/prometheus/_help.html.haml
@@ -3,7 +3,5 @@
 
 %h4.append-bottom-default
   = s_('PrometheusService|Manual configuration')
-
-- unless @service.editable?
-  .info-well
-    = s_('PrometheusService|To enable manual configuration, uninstall Prometheus from your clusters')
+%p
+  = s_('PrometheusService|Select the Active checkbox to override the Auto Configuration with custom settings. If unchecked, Auto Configuration settings are used.')