diff options
Diffstat (limited to 'app/views/projects/pipelines')
| -rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/pipelines/show.html.haml | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 3ff370dfaa4..753bb77e755 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -16,7 +16,7 @@ .icon-container = sprite_icon('clock', css_class: 'gl-top-0!') = n_('%d job', '%d jobs', @pipeline.total_size) % @pipeline.total_size - = @pipeline.ref_text + = @pipeline.ref_text_legacy - if @pipeline.finished_at - duration = time_interval_in_words(@pipeline.duration) - queued_duration = time_interval_in_words(@pipeline.queued_duration) diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml index a7d670f8475..46e1cd07a17 100644 --- a/app/views/projects/pipelines/show.html.haml +++ b/app/views/projects/pipelines/show.html.haml @@ -9,11 +9,14 @@ - add_page_startup_graphql_call('pipelines/get_pipeline_details', { projectPath: @project.full_path, iid: @pipeline.iid }) .js-pipeline-container{ data: { controller_action: "#{controller.action_name}" } } - #js-pipeline-header-vue.pipeline-header-container{ data: { full_path: @project.full_path, graphql_resource_etag: graphql_etag_pipeline_path(@pipeline), pipeline_iid: @pipeline.iid, pipeline_id: @pipeline.id, pipelines_path: project_pipelines_path(@project) } } + - if Feature.enabled?(:pipeline_details_header_vue, @project) + #js-pipeline-details-header-vue{ data: js_pipeline_details_header_data(@project, @pipeline) } + - else + #js-pipeline-header-vue.pipeline-header-container{ data: { full_path: @project.full_path, graphql_resource_etag: graphql_etag_pipeline_path(@pipeline), pipeline_iid: @pipeline.iid, pipeline_id: @pipeline.id, pipelines_path: project_pipelines_path(@project) } } = render_if_exists 'projects/pipelines/cc_validation_required_alert', pipeline: @pipeline - - if @pipeline.commit.present? + - if @pipeline.commit.present? && !Feature.enabled?(:pipeline_details_header_vue, @project) = render "projects/pipelines/info", commit: @pipeline.commit - if pipeline_has_errors |