diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-10 12:11:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-10 12:11:57 +0300 |
commit | ef4c0a743bcfee11a647c9ada6249c3399888866 (patch) | |
tree | f43883d0089f43812fee15ba60c02554583d7643 /app/views | |
parent | 36ff95a8a93225f47a833989429cc766a6ff2661 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/admin/application_settings/_jira_connect.html.haml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_jira_connect.html.haml b/app/views/admin/application_settings/_jira_connect.html.haml index ad0660797ee..235b6855123 100644 --- a/app/views/admin/application_settings/_jira_connect.html.haml +++ b/app/views/admin/application_settings/_jira_connect.html.haml @@ -8,7 +8,12 @@ = expanded ? _('Collapse') : _('Expand') %p = s_('JiraConnect|Configure your Jira Connect Application ID.') - = link_to sprite_icon('question-o'), 'https://marketplace.atlassian.com/apps/1221011/gitlab-com-for-jira-cloud', target: '_blank', rel: "noopener noreferrer", class: 'has-tooltip', title: _('More information'), aria: { label: _('GitLab for Jira Cloud') } + = link_to sprite_icon('question-o'), + help_page_path('integration/jira/connect-app', + aria: { label: _('GitLab for Jira Cloud') }, + class: 'has-tooltip', + anchor: 'connect-the-gitlab-for-jira-cloud-app-for-self-managed-instances'), + title: _('More information') .settings-content = gitlab_ui_form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-jira-connect-application-id-settings'), html: { class: 'fieldset-form', id: 'jira-connect-application-id-settings' } do |f| @@ -24,4 +29,8 @@ = f.label :jira_connect_proxy_url, s_('JiraConnect|Jira Connect Proxy URL'), class: 'label-bold' = f.text_field :jira_connect_proxy_url, class: 'form-control gl-form-input' + %fieldset + .form-group + = f.gitlab_ui_checkbox_component :jira_connect_public_key_storage_enabled, s_('JiraConnect|Enable public key storage') + = f.submit _('Save changes'), pajamas_button: true |