summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/filtered_search/dropdown_emoji.js
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-05-02 15:11:14 -0700
committerStan Hu <stanhu@gmail.com>2019-05-02 15:11:14 -0700
commit79890748cf653aca57b194eb4950c650b390e9a9 (patch)
treed25e96a309cae063882852a444706d40c1671d0c /app/assets/javascripts/filtered_search/dropdown_emoji.js
parent5259e75d79568946e9e49f5420caec32122cd9ff (diff)
parent206504008cb8dbcddd05545d71c644c059801250 (diff)
downloadgitlab-ce-56557-disable-kubernetes-namespace-service-account-backend.tar.gz
Merge branch 'master' into 56557-disable-kubernetes-namespace-service-account-backend56557-disable-kubernetes-namespace-service-account-backend
Diffstat (limited to 'app/assets/javascripts/filtered_search/dropdown_emoji.js')
-rw-r--r--app/assets/javascripts/filtered_search/dropdown_emoji.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/filtered_search/dropdown_emoji.js b/app/assets/javascripts/filtered_search/dropdown_emoji.js
index d9a4d06b549..dad188f6f98 100644
--- a/app/assets/javascripts/filtered_search/dropdown_emoji.js
+++ b/app/assets/javascripts/filtered_search/dropdown_emoji.js
@@ -3,6 +3,7 @@ import Ajax from '../droplab/plugins/ajax';
import Filter from '../droplab/plugins/filter';
import FilteredSearchDropdown from './filtered_search_dropdown';
import DropdownUtils from './dropdown_utils';
+import { __ } from '~/locale';
export default class DropdownEmoji extends FilteredSearchDropdown {
constructor(options = {}) {
@@ -14,7 +15,7 @@ export default class DropdownEmoji extends FilteredSearchDropdown {
loadingTemplate: this.loadingTemplate,
onError() {
/* eslint-disable no-new */
- new Flash('An error occurred fetching the dropdown data.');
+ new Flash(__('An error occurred fetching the dropdown data.'));
/* eslint-enable no-new */
},
},