diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-10-03 16:49:06 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-10-03 16:49:06 +0100 |
| commit | 4447559f6166dfa6af1c4d2440889f44b5eb1093 (patch) | |
| tree | ce7cc0d914073b1fd607d057d793fe109640b12d /app/assets/javascripts/filtered_search/dropdown_emoji.js | |
| parent | 97f1369990e3dd33e7f0632cfb0b7cffc64c3f5e (diff) | |
| parent | fc95cd5bc6666076b5aceec20046e771f5c126bf (diff) | |
| download | gitlab-ce-4447559f6166dfa6af1c4d2440889f44b5eb1093.tar.gz | |
Merge branch '18608-lock-issues-v2' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues-v2
Diffstat (limited to 'app/assets/javascripts/filtered_search/dropdown_emoji.js')
| -rw-r--r-- | app/assets/javascripts/filtered_search/dropdown_emoji.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/filtered_search/dropdown_emoji.js b/app/assets/javascripts/filtered_search/dropdown_emoji.js index f9bbbf0cbc1..ada14d2053c 100644 --- a/app/assets/javascripts/filtered_search/dropdown_emoji.js +++ b/app/assets/javascripts/filtered_search/dropdown_emoji.js @@ -14,7 +14,7 @@ class DropdownEmoji extends gl.FilteredSearchDropdown { loadingTemplate: this.loadingTemplate, onError() { /* eslint-disable no-new */ - new Flash('An error occured fetching the dropdown data.'); + new Flash('An error occurred fetching the dropdown data.'); /* eslint-enable no-new */ }, }, |