Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-15 00:09:03 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-15 00:09:03 +0300
commitf9cda7671cfb07795d9ea01a7117f7d6c6511d0d (patch)
tree71233af70149f655249c475e764a8c2cd560b096 /app/assets/javascripts/gfm_auto_complete.js
parent18ffa5e88194d8f3fd63bee0221de5bc1fbdfe94 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/gfm_auto_complete.js')
-rw-r--r--app/assets/javascripts/gfm_auto_complete.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js
index 14efc2acbac..36c586ddfd2 100644
--- a/app/assets/javascripts/gfm_auto_complete.js
+++ b/app/assets/javascripts/gfm_auto_complete.js
@@ -109,8 +109,10 @@ class GfmAutoComplete {
tpl += ' <small class="params"><%- params.join(" ") %></small>';
}
if (value.warning && value.icon && value.icon === 'confidential') {
- tpl +=
- '<small class="description"><em><i class="fa fa-eye-slash" aria-hidden="true"/><%- warning %></em></small>';
+ tpl += `<small class="description gl-display-flex gl-align-items-center">${spriteIcon(
+ 'eye-slash',
+ 's16 gl-mr-2',
+ )}<em><%- warning %></em></small>`;
} else if (value.warning) {
tpl += '<small class="description"><em><%- warning %></em></small>';
} else if (value.description !== '') {