diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-30 02:01:38 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-30 02:01:38 +0000 |
| commit | 6d7384f59525e2d54c30011237499c27bde145ef (patch) | |
| tree | f3bd5b3bfdb25bb1de0e5c65ce5aa3595ceb33cf /app/assets/javascripts/notes | |
| parent | 1aae91cf24606275834d6e17279ce14c1074dade (diff) | |
| parent | f7bdfe5098c9a5a3a426344ba1d7dd668212cf7e (diff) | |
| download | gitlab-ce-6d7384f59525e2d54c30011237499c27bde145ef.tar.gz | |
Merge branch 'es-module-autosave' into 'master'
Remove Autosave class from global namespace
See merge request gitlab-org/gitlab-ce!14856
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/components/issue_comment_form.vue | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/notes/mixins/autosave.js | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/assets/javascripts/notes/components/issue_comment_form.vue b/app/assets/javascripts/notes/components/issue_comment_form.vue index 2ce52e4538a..ad384a1cc36 100644 --- a/app/assets/javascripts/notes/components/issue_comment_form.vue +++ b/app/assets/javascripts/notes/components/issue_comment_form.vue @@ -1,10 +1,9 @@ <script> - /* global Autosave */ import { mapActions, mapGetters } from 'vuex'; import _ from 'underscore'; import autosize from 'vendor/autosize'; import Flash from '../../flash'; - import '../../autosave'; + import Autosave from '../../autosave'; import TaskList from '../../task_list'; import * as constants from '../constants'; import eventHub from '../event_hub'; diff --git a/app/assets/javascripts/notes/mixins/autosave.js b/app/assets/javascripts/notes/mixins/autosave.js index 5843b97f225..a008171beda 100644 --- a/app/assets/javascripts/notes/mixins/autosave.js +++ b/app/assets/javascripts/notes/mixins/autosave.js @@ -1,5 +1,4 @@ -/* globals Autosave */ -import '../../autosave'; +import Autosave from '../../autosave'; export default { methods: { |