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/sidebar | |
| 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/sidebar')
| -rw-r--r-- | app/assets/javascripts/sidebar/lib/sidebar_move_issue.js | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/sidebar/sidebar_mediator.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js b/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js index 1c15a1b877a..3c9de02407e 100644 --- a/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js +++ b/app/assets/javascripts/sidebar/lib/sidebar_move_issue.js @@ -38,7 +38,7 @@ class SidebarMoveIssue { data: (searchTerm, callback) => { this.mediator.fetchAutocompleteProjects(searchTerm) .then(callback) - .catch(() => new Flash('An error occured while fetching projects autocomplete.')); + .catch(() => new Flash('An error occurred while fetching projects autocomplete.')); }, renderRow: project => ` <li> @@ -73,7 +73,7 @@ class SidebarMoveIssue { this.mediator.moveIssue() .catch(() => { - Flash('An error occured while moving the issue.'); + Flash('An error occurred while moving the issue.'); this.$confirmButton .enable() .removeClass('is-loading'); diff --git a/app/assets/javascripts/sidebar/sidebar_mediator.js b/app/assets/javascripts/sidebar/sidebar_mediator.js index e38a8db4cc5..2fe6e5b31f0 100644 --- a/app/assets/javascripts/sidebar/sidebar_mediator.js +++ b/app/assets/javascripts/sidebar/sidebar_mediator.js @@ -41,7 +41,7 @@ export default class SidebarMediator { this.store.setAssigneeData(data); this.store.setTimeTrackingData(data); }) - .catch(() => new Flash('Error occured when fetching sidebar data')); + .catch(() => new Flash('Error occurred when fetching sidebar data')); } fetchAutocompleteProjects(searchTerm) { |