diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-10 16:51:47 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-10 16:51:47 +0300 |
| commit | e4e8e0fc9df9dbd1cc6582ef9932a346e1c376a0 (patch) | |
| tree | 88d27ab6dbcfd16034b06c4e18418bf839eb0420 /app/assets/javascripts/jobs | |
| parent | 1fb4215beaa214f22ee59ebf7182a1696ad6baa5 (diff) | |
| parent | b40bac3a3c251110ddba3f90d6d1e4419a65afe3 (diff) | |
Merge branch 'flash-es6-module' into 'master'
Flash is now a ES6 module
See merge request gitlab-org/gitlab-ce!14626
Diffstat (limited to 'app/assets/javascripts/jobs')
| -rw-r--r-- | app/assets/javascripts/jobs/job_details_bundle.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/jobs/job_details_mediator.js | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/assets/javascripts/jobs/job_details_bundle.js b/app/assets/javascripts/jobs/job_details_bundle.js index f92e669414a..baaf5641200 100644 --- a/app/assets/javascripts/jobs/job_details_bundle.js +++ b/app/assets/javascripts/jobs/job_details_bundle.js @@ -1,5 +1,3 @@ -/* global Flash */ - import Vue from 'vue'; import JobMediator from './job_details_mediator'; import jobHeader from './components/header.vue'; diff --git a/app/assets/javascripts/jobs/job_details_mediator.js b/app/assets/javascripts/jobs/job_details_mediator.js index 14c7b96e54d..3e2658f9fc1 100644 --- a/app/assets/javascripts/jobs/job_details_mediator.js +++ b/app/assets/javascripts/jobs/job_details_mediator.js @@ -1,7 +1,7 @@ -/* global Flash */ /* global Build */ import Visibility from 'visibilityjs'; +import Flash from '../flash'; import Poll from '../lib/utils/poll'; import JobStore from './stores/job_store'; import JobService from './services/job_service'; |