Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c7fcc561
Commit
c7fcc561
authored
Aug 10, 2020
by
Dheeraj Joshi
Committed by
Kushal Pandya
Aug 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove blacklist terminology from License Compliance
parent
c6e88d58
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
ee/app/assets/javascripts/vue_shared/license_compliance/license_management.vue
...ipts/vue_shared/license_compliance/license_management.vue
+2
-4
ee/changelogs/unreleased/djadmin-remove-blacklist.yml
ee/changelogs/unreleased/djadmin-remove-blacklist.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+2
-2
No files found.
ee/app/assets/javascripts/vue_shared/license_compliance/license_management.vue
View file @
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 licens
es that match in this project.
'
,
'
LicenseCompliance|There are currently no
polici
es that match in this project.
'
,
),
};
</
script
>
...
...
ee/changelogs/unreleased/djadmin-remove-blacklist.yml
0 → 100644
View file @
c7fcc561
---
title
:
Remove blacklist terminology from License Compliance
merge_request
:
39071
author
:
type
:
other
locale/gitlab.pot
View file @
c7fcc561
...
...
@@ -14202,10 +14202,10 @@ msgstr ""
msgid "LicenseCompliance|Remove license?"
msgstr ""
msgid "LicenseCompliance|There are currently no
approved or blacklisted licens
es in this project."
msgid "LicenseCompliance|There are currently no
polici
es in this project."
msgstr ""
msgid "LicenseCompliance|There are currently no
approved or blacklisted licens
es that match in this project."
msgid "LicenseCompliance|There are currently no
polici
es that match in this project."
msgstr ""
msgid "LicenseCompliance|This license already exists in this project."
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment