Commit d506efa0 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'djadmin-remove-blacklist' into 'master'

Remove blacklist terminology from License Compliance

See merge request gitlab-org/gitlab!39071
parents 24af8e6d c7fcc561
......@@ -69,11 +69,9 @@ export default {
this.formIsOpen = false;
},
},
emptyMessage: s__(
'LicenseCompliance|There are currently no approved or blacklisted licenses in this project.',
),
emptyMessage: s__('LicenseCompliance|There are currently no policies in this project.'),
emptySearchMessage: s__(
'LicenseCompliance|There are currently no approved or blacklisted licenses that match in this project.',
'LicenseCompliance|There are currently no policies that match in this project.',
),
};
</script>
......
---
title: Remove blacklist terminology from License Compliance
merge_request: 39071
author:
type: other
......@@ -14214,10 +14214,10 @@ msgstr ""
msgid "LicenseCompliance|Remove license?"
msgstr ""
msgid "LicenseCompliance|There are currently no approved or blacklisted licenses in this project."
msgid "LicenseCompliance|There are currently no policies in this project."
msgstr ""
msgid "LicenseCompliance|There are currently no approved or blacklisted licenses that match in this project."
msgid "LicenseCompliance|There are currently no policies that match in this project."
msgstr ""
msgid "LicenseCompliance|This license already exists in this project."
......
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