summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorceldem <celdem@gitlab.com>2019-06-20 10:54:00 +0100
committerceldem <celdem@gitlab.com>2019-06-20 10:54:00 +0100
commitd18309f7c75bbdd209afe9164b0906e5679a4af8 (patch)
treec838f6ccb626c3e6e5366ceba584b4f215036670
parent219a8ae3c9d302305ae0bdb3ca79666bb51d5305 (diff)
downloadgitlab-ce-caneldem/update-lm-paraghraph.tar.gz
-rw-r--r--ee/app/views/projects/settings/ci_cd/_managed_licenses.html.haml7
1 files changed, 4 insertions, 3 deletions
diff --git a/ee/app/views/projects/settings/ci_cd/_managed_licenses.html.haml b/ee/app/views/projects/settings/ci_cd/_managed_licenses.html.haml
index 45e8b32bd2c..a0687454680 100644
--- a/ee/app/views/projects/settings/ci_cd/_managed_licenses.html.haml
+++ b/ee/app/views/projects/settings/ci_cd/_managed_licenses.html.haml
@@ -9,6 +9,7 @@
%button.btn.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand')
%p
- = s_('LicenseManagement|Manage approved and blacklisted licenses for this project.')
- .settings-content
- #js-managed-licenses{ data: { api_url: @license_management_url } }
+ - ci = link_to(s_('Gitlab CI/CD'), 'https://docs.gitlab.com/ee/ci/', target: '_blank', rel: 'noopener noreferrer')
+ - license = link_to(s_('Auto License Complience'), 'https://docs.gitlab.com/ee/topics/autodevops/index.html#auto-license-management-ultimate', target: '_blank', rel: 'noopener noreferrer')
+ = s_('License Compliance|Here you can approve or blacklist licenses for this project. Using %{ci} or %{license} will allow you to see if there are any unmanaged licenses and approve or blacklist them in merge request.').html_safe % { ci: ci, license: license }
+ \ No newline at end of file