Commit 386b29a9 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'kpaizee-fix-links-to-jira-docs' into 'master'

Fix links to Jira docs

See merge request gitlab-org/gitlab!85085
parents fe874613 fae23e10
...@@ -43,7 +43,9 @@ export default { ...@@ -43,7 +43,9 @@ export default {
message: s__( message: s__(
'Integrations|You should now see GitLab.com activity inside your Jira Cloud issues. %{linkStart}Learn more%{linkEnd}', 'Integrations|You should now see GitLab.com activity inside your Jira Cloud issues. %{linkStart}Learn more%{linkEnd}',
), ),
linkUrl: helpPagePath('integration/jira_development_panel.html', { anchor: 'usage' }), linkUrl: helpPagePath('integration/jira_development_panel.html', {
anchor: 'use-the-integration',
}),
variant: 'success', variant: 'success',
}); });
......
...@@ -68,7 +68,7 @@ module Jira ...@@ -68,7 +68,7 @@ module Jira
end end
def auth_docs_link_start def auth_docs_link_start
auth_docs_link_url = Rails.application.routes.url_helpers.help_page_path('integration/jira', anchor: 'authentication-in-jira') auth_docs_link_url = Rails.application.routes.url_helpers.help_page_path('integration/jira/index', anchor: 'authentication-in-jira')
'<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: auth_docs_link_url } '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: auth_docs_link_url }
end end
......
...@@ -72,7 +72,7 @@ describe('GroupsListItem', () => { ...@@ -72,7 +72,7 @@ describe('GroupsListItem', () => {
expect(addSubscriptionSpy).toHaveBeenCalledWith(mockSubscriptionPath, mockGroup1.full_path); expect(addSubscriptionSpy).toHaveBeenCalledWith(mockSubscriptionPath, mockGroup1.full_path);
expect(persistAlert).toHaveBeenCalledWith({ expect(persistAlert).toHaveBeenCalledWith({
linkUrl: '/help/integration/jira_development_panel.html#usage', linkUrl: '/help/integration/jira_development_panel.html#use-the-integration',
message: message:
'You should now see GitLab.com activity inside your Jira Cloud issues. %{linkStart}Learn more%{linkEnd}', 'You should now see GitLab.com activity inside your Jira Cloud issues. %{linkStart}Learn more%{linkEnd}',
title: 'Namespace successfully linked', title: 'Namespace successfully linked',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment