diff --git a/app/assets/javascripts/vue_shared/components/crud_component.vue b/app/assets/javascripts/vue_shared/components/crud_component.vue index c00aa3a5b2c5a9de9f947b2c603004d73b958526..ef970cb2c72eaefdb4717abea537c5710f3ade03 100644 --- a/app/assets/javascripts/vue_shared/components/crud_component.vue +++ b/app/assets/javascripts/vue_shared/components/crud_component.vue @@ -171,7 +171,7 @@ export default { :class="{ 'gl-mt-5': isCollapsible }" >
'.html_safe % { url: integrations_help_page_path } + = s_("Integrations|GitLab administrators can set up integrations that all groups and projects inherit and use by default. These integrations apply to all groups and projects that don't already use custom settings. You can override custom settings for a group or project if the settings are necessary at that level. Learn more about %{integrations_link_start}instance-level integration management%{link_end}.").html_safe % { integrations_link_start: integrations_link_start, link_end: "".html_safe } -- integrations_link_start = ''.html_safe % { url: integrations_help_page_path } -%p= s_("Integrations|GitLab administrators can set up integrations that all groups and projects inherit and use by default. These integrations apply to all groups and projects that don't already use custom settings. You can override custom settings for a group or project if the settings are necessary at that level. Learn more about %{integrations_link_start}instance-level integration management%{link_end}.").html_safe % { integrations_link_start: integrations_link_start, link_end: "".html_safe } = render 'shared/integrations/index', integrations: @integrations diff --git a/app/views/shared/integrations/overrides.html.haml b/app/views/shared/integrations/overrides.html.haml index b54bbf394f6d474caa8a5dbdfc144547b2a8093e..5ea6d21dc8ec269119040107d54c0c4417e8861d 100644 --- a/app/views/shared/integrations/overrides.html.haml +++ b/app/views/shared/integrations/overrides.html.haml @@ -2,8 +2,7 @@ - breadcrumb_title @integration.title - page_title @integration.title, _('Integrations') -%h1.page-title.gl-text-size-h-display - = @integration.title += render ::Layouts::PageHeadingComponent.new(@integration.title) - if @integration.title == 'Beyond Identity' .js-vue-beyond-identity-exclusions{ data: integration_overrides_data(@integration) }