diff options
| author | Phil Hughes <me@iamphill.com> | 2019-06-26 15:40:51 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-06-26 15:40:51 +0000 |
| commit | 55c704a585682c0ef7265fdb49f595e874fc4aeb (patch) | |
| tree | 6ccd189f48f766b2aed3dd905e3d6b0e35641aa4 | |
| parent | 8c89668d7d5a34bc7910d7b40aff2ef68739ed28 (diff) | |
| parent | 82f4ebda6963ab5fc8bd42974e88e8676636e952 (diff) | |
| download | gitlab-ce-55c704a585682c0ef7265fdb49f595e874fc4aeb.tar.gz | |
Merge branch '12428-pipelines' into 'master'
Removes EE differences for app/assets/javascripts/pipelines/pipeline_details_mediator.js
Closes gitlab-ee#12428
See merge request gitlab-org/gitlab-ce!30085
| -rw-r--r-- | app/assets/javascripts/pipelines/pipeline_details_mediator.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/pipelines/pipeline_details_mediator.js b/app/assets/javascripts/pipelines/pipeline_details_mediator.js index d67d88c4dba..c8819cf35cf 100644 --- a/app/assets/javascripts/pipelines/pipeline_details_mediator.js +++ b/app/assets/javascripts/pipelines/pipeline_details_mediator.js @@ -1,8 +1,8 @@ import Visibility from 'visibilityjs'; +import PipelineStore from 'ee_else_ce/pipelines/stores/pipeline_store'; import Flash from '../flash'; import Poll from '../lib/utils/poll'; import { __ } from '../locale'; -import PipelineStore from './stores/pipeline_store'; import PipelineService from './services/pipeline_service'; export default class pipelinesMediator { |