diff --git a/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js b/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js index 66845e03963eca00057933a11d9b5144bff71985..426d5d8a8b6927550b5f17efab40350dbb840c4b 100644 --- a/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js +++ b/app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js @@ -12,6 +12,7 @@ import { initCiSecureFiles } from '~/ci_secure_files'; import initDeployTokens from '~/deploy_tokens'; import { initProjectRunnersRegistrationDropdown } from '~/ci/runner/project_runners/register'; import { initGeneralPipelinesOptions } from '~/ci_settings_general_pipeline'; +import { renderGFM } from '~/behaviors/markdown/render_gfm'; // Initialize expandable settings panels initSettingsPanels(); @@ -42,3 +43,5 @@ initRefSwitcherBadges(); initTokenAccess(); initCiSecureFiles(); initGeneralPipelinesOptions(); + +renderGFM(document.getElementById('js-shared-runners-markdown')); diff --git a/app/views/shared/runners/_shared_runners_description.html.haml b/app/views/shared/runners/_shared_runners_description.html.haml index 3878879f37fe75ab59b91407cbc30a7511869aec..a5145bbce40da2b1f6e618177d3a0c5044e80ff4 100644 --- a/app/views/shared/runners/_shared_runners_description.html.haml +++ b/app/views/shared/runners/_shared_runners_description.html.haml @@ -9,4 +9,4 @@ - c.with_body do %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) + #js-shared-runners-markdown= markdown(Gitlab::CurrentSettings.current_application_settings.shared_runners_text) diff --git a/spec/frontend/pages/projects/settings/ci_cd/show/index_spec.js b/spec/frontend/pages/projects/settings/ci_cd/show/index_spec.js new file mode 100644 index 0000000000000000000000000000000000000000..53aba8ad7a7311e360775b7130734d9cfefaabe6 --- /dev/null +++ b/spec/frontend/pages/projects/settings/ci_cd/show/index_spec.js @@ -0,0 +1,12 @@ +import { renderGFM } from '~/behaviors/markdown/render_gfm'; + +jest.mock('~/behaviors/markdown/render_gfm'); + +describe('CI/CD Settings', () => { + it('calls `renderGFM` to ensure that all gitlab-flavoured markdown is rendered on the CI/CD Settings page', async () => { + jest.spyOn(document, 'getElementById').getMockImplementation(); + await import('~/pages/projects/settings/ci_cd/show'); + expect(document.getElementById).toHaveBeenCalledWith('js-shared-runners-markdown'); + expect(renderGFM).toHaveBeenCalledTimes(1); + }); +});