diff --git a/app/views/shared/runners/_shared_runners_description.html.haml b/app/views/shared/runners/_shared_runners_description.html.haml index 01b601ef986a42486ff21f6e63a3a67e7f365f3f..c8ddb5d517601458468da639b624d6e43a63320f 100644 --- a/app/views/shared/runners/_shared_runners_description.html.haml +++ b/app/views/shared/runners/_shared_runners_description.html.haml @@ -1,5 +1,3 @@ --# "MaxBuilds" is a runner configuration keyword so it must not be translated. -- link = link_to 'MaxBuilds', 'https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runnersmachine-section', target: '_blank', rel: 'noopener noreferrer' - shared_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('ci/runners/runners_scope.md', anchor: 'shared-runners') } %h4 @@ -9,5 +7,3 @@ %p= s_('Runners|%{link_start}These runners%{link_end} are available to all groups and projects.').html_safe % { link_start: shared_link_start, link_end: '</a>'.html_safe } - if Gitlab::CurrentSettings.shared_runners_text.present? = markdown(Gitlab::CurrentSettings.current_application_settings.shared_runners_text) - - else - %p= _('The same shared runner executes code from multiple projects, unless you configure autoscaling with %{link} set to 1 (which it is on GitLab.com).').html_safe % { link: link } diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 69eb3e050049c819d3750b6bddd24391c50a283a..1821a9a820ebb6612cb1fe6988b68a55d5c49863 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -40395,9 +40395,6 @@ msgstr "" msgid "The resource that you are attempting to access does not exist or you don't have permission to perform this action." msgstr "" -msgid "The same shared runner executes code from multiple projects, unless you configure autoscaling with %{link} set to 1 (which it is on GitLab.com)." -msgstr "" - msgid "The scan has been created." msgstr "" diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb index 482f3d62f362f89cdd16eddb8cdfbee2fb656d4e..cee0910aef754e13ad980a8f596e1770e44fb98b 100644 --- a/spec/features/runners_spec.rb +++ b/spec/features/runners_spec.rb @@ -160,16 +160,6 @@ end context 'shared runner text' do - context 'when application settings have no shared_runners_text' do - it 'user sees default shared runners description' do - visit project_runners_path(project) - - page.within("[data-testid='shared-runners-description']") do - expect(page).to have_content('The same shared runner executes code from multiple projects') - end - end - end - context 'when application settings have shared_runners_text' do let(:shared_runners_text) { 'custom **shared** runners description' } let(:shared_runners_html) { 'custom shared runners description' }