diff options
author | Phil Hughes <me@iamphill.com> | 2017-10-02 13:32:53 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-10-10 10:14:22 +0100 |
commit | fa2af5e0f5e290eff32f62c7ea9f935a6ad33967 (patch) | |
tree | 539846b44a1e8e5c0c3117bf71455c6131c135d1 /app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js | |
parent | 99806914a5ca382b22588de722a0db1c7a8bfff6 (diff) | |
download | gitlab-ce-fa2af5e0f5e290eff32f62c7ea9f935a6ad33967.tar.gz |
Flash is now a ES6 module
Reduced the technical debt around our JS flash function by making it a
module that is imported rather than relying on the global function.
The global function still exists mainly for technical debt with how
some requests are being completed, but new JS should import the module
directly.
Also reduces some tech debt in the file by removing the need for jQuery.
Instead Flash is now 100% vanilla JS.
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js index 74fc52796a0..2dfd87ed904 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.js @@ -1,5 +1,4 @@ -/* global Flash */ - +import Flash from '../../../flash'; import mrWidgetAuthorTime from '../../components/mr_widget_author_time'; import tooltip from '../../../vue_shared/directives/tooltip'; import loadingIcon from '../../../vue_shared/components/loading_icon.vue'; |