diff options
| author | Phil Hughes <me@iamphill.com> | 2018-08-06 13:22:55 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-08-06 13:22:55 +0300 |
| commit | cff3e685847498d56ba9e590fe767fb6f777ef69 (patch) | |
| tree | ed0173a838f50ddae7794a84d34a2613d13619e3 | |
| parent | 3bdab23c89cb3985074a7efaa3ac54c154836034 (diff) | |
| parent | c939003d9a8415f18fd099655668f5a6a9d415f4 (diff) | |
Merge branch 'leipert-fix-pipelines-view' into 'master'
Fix initialization of JS in pipeline `/failures` tab
Closes #49994
See merge request gitlab-org/gitlab-ce!21043
3 files changed, 9 insertions, 10 deletions
diff --git a/app/assets/javascripts/pages/projects/pipelines/builds/index.js b/app/assets/javascripts/pages/projects/pipelines/builds/index.js index 7a57e417b41..957c72008bd 100644 --- a/app/assets/javascripts/pages/projects/pipelines/builds/index.js +++ b/app/assets/javascripts/pages/projects/pipelines/builds/index.js @@ -1,7 +1,2 @@ -import initPipelineDetails from '~/pipelines/pipeline_details_bundle'; -import initPipelines from '../init_pipelines'; - -document.addEventListener('DOMContentLoaded', () => { - initPipelines(); - initPipelineDetails(); -}); +// /builds is an alias for show +import '../show/index'; diff --git a/app/assets/javascripts/pages/projects/pipelines/failures/index.js b/app/assets/javascripts/pages/projects/pipelines/failures/index.js index fbe9824c34b..8ba6fc3ae1d 100644 --- a/app/assets/javascripts/pages/projects/pipelines/failures/index.js +++ b/app/assets/javascripts/pages/projects/pipelines/failures/index.js @@ -1,3 +1,2 @@ -import initPipelines from '../init_pipelines'; - -document.addEventListener('DOMContentLoaded', initPipelines); +// /failures is an alias for show +import '../show/index'; diff --git a/changelogs/unreleased/leipert-fix-pipelines-view.yml b/changelogs/unreleased/leipert-fix-pipelines-view.yml new file mode 100644 index 00000000000..7bcc2e84cd2 --- /dev/null +++ b/changelogs/unreleased/leipert-fix-pipelines-view.yml @@ -0,0 +1,5 @@ +--- +title: Fix rendering of pipeline failure view when directly navigationg to it +merge_request: 21043 +author: +type: fixed |