diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-02-21 22:23:58 +0100 |
|---|---|---|
| committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-02-21 22:23:58 +0100 |
| commit | 11c1fc1fae5810123f683630c92bf1e9e7eab3d0 (patch) | |
| tree | f1d0a5a73539b8b7be172be6cb91ccaf6b3dd420 /app/views/projects/jobs | |
| parent | 84016f8335f885538dd1ddc9b88cc716324b9613 (diff) | |
| parent | 88870c871eeb55ff43cf638ba8d7307b263393c3 (diff) | |
| download | gitlab-ce-11c1fc1fae5810123f683630c92bf1e9e7eab3d0.tar.gz | |
Resolved conflicts with master
Diffstat (limited to 'app/views/projects/jobs')
| -rw-r--r-- | app/views/projects/jobs/show.html.haml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/views/projects/jobs/show.html.haml b/app/views/projects/jobs/show.html.haml index 93efa7e8e86..849c273db8c 100644 --- a/app/views/projects/jobs/show.html.haml +++ b/app/views/projects/jobs/show.html.haml @@ -112,7 +112,3 @@ .js-build-options{ data: javascript_build_options } #js-job-details-vue{ data: { endpoint: project_job_path(@project, @build, format: :json) } } - -- content_for :page_specific_javascripts do - = webpack_bundle_tag('common_vue') - = webpack_bundle_tag('job_details') |