diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-15 21:10:06 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-15 21:10:06 +0300 |
| commit | b07852468f800d751ddecc9e327119d7295f538e (patch) | |
| tree | d1169f95ea3725d609c796a1ca87d5766646852c /app/assets/javascripts/vue_shared | |
| parent | 0ff373dc416216d02760c7c162ee23382eb1f4a3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared')
| -rw-r--r-- | app/assets/javascripts/vue_shared/components/gfm_autocomplete/gfm_autocomplete.vue | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_shared/components/gfm_autocomplete/gfm_autocomplete.vue b/app/assets/javascripts/vue_shared/components/gfm_autocomplete/gfm_autocomplete.vue index fb61c13983f..1ad0ca36bf8 100644 --- a/app/assets/javascripts/vue_shared/components/gfm_autocomplete/gfm_autocomplete.vue +++ b/app/assets/javascripts/vue_shared/components/gfm_autocomplete/gfm_autocomplete.vue @@ -1,5 +1,5 @@ <script> -import Tribute from 'tributejs'; +import Tribute from '@gitlab/tributejs'; import { GfmAutocompleteType, tributeConfig, @@ -29,6 +29,10 @@ export default { config() { return this.autocompleteTypes.map(type => ({ ...tributeConfig[type].config, + loadingItemTemplate: `<span class="gl-spinner gl-vertical-align-text-bottom gl-ml-3 gl-mr-2"></span>${__( + 'Loading', + )}`, + requireLeadingSpace: true, values: this.getValues(type), })); }, |