diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-16 18:19:41 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-16 18:19:41 +0200 |
| commit | 9f2c992ff1520e35d9b7bc26d603d597bc189618 (patch) | |
| tree | 17af71363c63d99a15c76b1edcbceddc87bfc12d /app/assets/javascripts/commit/pipelines/pipelines_table.js | |
| parent | 64bb0d37d4ef1f8574355019f198e40bc9b70224 (diff) | |
| parent | 5f42009f8dcc29d559ee415e92c88858e361f063 (diff) | |
| download | gitlab-ce-9f2c992ff1520e35d9b7bc26d603d597bc189618.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch
Diffstat (limited to 'app/assets/javascripts/commit/pipelines/pipelines_table.js')
| -rw-r--r-- | app/assets/javascripts/commit/pipelines/pipelines_table.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/commit/pipelines/pipelines_table.js b/app/assets/javascripts/commit/pipelines/pipelines_table.js index 082fbafb740..70ba83ce5b9 100644 --- a/app/assets/javascripts/commit/pipelines/pipelines_table.js +++ b/app/assets/javascripts/commit/pipelines/pipelines_table.js @@ -1,6 +1,6 @@ import Vue from 'vue'; import Visibility from 'visibilityjs'; -import pipelinesTableComponent from '../../vue_shared/components/pipelines_table'; +import pipelinesTableComponent from '../../vue_shared/components/pipelines_table.vue'; import PipelinesService from '../../pipelines/services/pipelines_service'; import PipelineStore from '../../pipelines/stores/pipelines_store'; import eventHub from '../../pipelines/event_hub'; |