Commit 7b580444 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'djadmin-scanner-profile-tooltip' into 'master'

DAST Scanner Profile Tooltips

See merge request gitlab-org/gitlab!41296
parents 6ea9c03c 43cd871a
...@@ -168,8 +168,12 @@ export default { ...@@ -168,8 +168,12 @@ export default {
modalTitle: s__('DastProfiles|Do you want to discard this scanner profile?'), modalTitle: s__('DastProfiles|Do you want to discard this scanner profile?'),
modalOkTitle: __('Discard'), modalOkTitle: __('Discard'),
modalCancelTitle: __('Cancel'), modalCancelTitle: __('Cancel'),
spiderTimeoutTooltip: '', spiderTimeoutTooltip: s__(
targetTimeoutTooltip: '', 'DastProfiles|The maximum number of seconds allowed for the spider to traverse the site.',
),
targetTimeoutTooltip: s__(
'DastProfiles|The maximum number of seconds allowed for the site under test to respond to a request.',
),
}, },
}; };
</script> </script>
...@@ -207,7 +211,6 @@ export default { ...@@ -207,7 +211,6 @@ export default {
<template #label> <template #label>
{{ s__('DastProfiles|Spider timeout') }} {{ s__('DastProfiles|Spider timeout') }}
<gl-icon <gl-icon
v-if="$options.i18n.spiderTimeoutTooltip"
v-gl-tooltip.hover v-gl-tooltip.hover
name="information-o" name="information-o"
class="gl-vertical-align-text-bottom gl-text-gray-400 gl-ml-2" class="gl-vertical-align-text-bottom gl-text-gray-400 gl-ml-2"
...@@ -240,7 +243,6 @@ export default { ...@@ -240,7 +243,6 @@ export default {
<template #label> <template #label>
{{ s__('DastProfiles|Target timeout') }} {{ s__('DastProfiles|Target timeout') }}
<gl-icon <gl-icon
v-if="$options.i18n.targetTimeoutTooltip"
v-gl-tooltip.hover v-gl-tooltip.hover
name="information-o" name="information-o"
class="gl-vertical-align-text-bottom gl-text-gray-400 gl-ml-2" class="gl-vertical-align-text-bottom gl-text-gray-400 gl-ml-2"
......
...@@ -7848,6 +7848,12 @@ msgstr "" ...@@ -7848,6 +7848,12 @@ msgstr ""
msgid "DastProfiles|Target timeout" msgid "DastProfiles|Target timeout"
msgstr "" msgstr ""
msgid "DastProfiles|The maximum number of seconds allowed for the site under test to respond to a request."
msgstr ""
msgid "DastProfiles|The maximum number of seconds allowed for the spider to traverse the site."
msgstr ""
msgid "Data is still calculating..." msgid "Data is still calculating..."
msgstr "" msgstr ""
......
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