diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-11 21:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-11 21:08:42 +0300 |
| commit | 48e26d30fd251f87a2e136d8997ef2ec35859e71 (patch) | |
| tree | f9b06f597bbb41de351454544971c6a01a7a7116 /app/assets/javascripts/confidential_merge_request | |
| parent | 3d6d338697a186496eecffc43a389106bfd60527 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/confidential_merge_request')
| -rw-r--r-- | app/assets/javascripts/confidential_merge_request/components/project_form_group.vue | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue b/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue index 88459d5962e..3a6707bc573 100644 --- a/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue +++ b/app/assets/javascripts/confidential_merge_request/components/project_form_group.vue @@ -1,5 +1,5 @@ <script> -import { GlLink, GlSprintf } from '@gitlab/ui'; +import { GlIcon, GlLink, GlSprintf } from '@gitlab/ui'; import { __ } from '../../locale'; import { deprecatedCreateFlash as createFlash } from '../../flash'; import Api from '../../api'; @@ -8,6 +8,7 @@ import Dropdown from './dropdown.vue'; export default { components: { + GlIcon, GlLink, GlSprintf, Dropdown, @@ -136,7 +137,7 @@ export default { target="_blank" > <span class="sr-only">{{ __('Read more') }}</span> - <i class="fa fa-question-circle" aria-hidden="true"></i> + <gl-icon name="question-o" /> </gl-link> </p> </div> |