diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-23 18:08:38 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-23 18:08:38 +0300 |
commit | 16dbaf57bc4d87aa8a2bca8bf9db7cab26d841c4 (patch) | |
tree | f5c6a87c9fbc0677c965d07b85a305cb2cb0fcc7 /app/views/projects/pipelines | |
parent | 3e68d3848770b492d314f8e2967c37f7fdd5d143 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/pipelines')
-rw-r--r-- | app/views/projects/pipelines/show.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml index ba498352278..2b0a0fc1253 100644 --- a/app/views/projects/pipelines/show.html.haml +++ b/app/views/projects/pipelines/show.html.haml @@ -27,6 +27,8 @@ = s_('You can also test your %{gitlab_ci_yml} in %{lint_link_start}CI Lint%{lint_link_end}').html_safe % { gitlab_ci_yml: '.gitlab-ci.yml', lint_link_start: lint_link_start, lint_link_end: '</a>'.html_safe } #js-pipeline-notification{ data: { deprecated_keywords_doc_path: help_page_path('ci/yaml/index.md', anchor: 'deprecated-keywords'), full_path: @project.full_path, pipeline_iid: @pipeline.iid } } - = render "projects/pipelines/with_tabs", pipeline: @pipeline, stages: @stages, pipeline_has_errors: pipeline_has_errors - + - if Feature.enabled?(:pipeline_tabs_vue, @project, default_enabled: :yaml) + #js-pipeline-tabs{ data: js_pipeline_tabs_data(@project, @pipeline) } + - else + = render "projects/pipelines/with_tabs", pipeline: @pipeline, stages: @stages, pipeline_has_errors: pipeline_has_errors .js-pipeline-details-vue{ data: { metrics_path: namespace_project_ci_prometheus_metrics_histograms_path(namespace_id: @project.namespace, project_id: @project, format: :json), pipeline_project_path: @project.full_path, pipeline_iid: @pipeline.iid, graphql_resource_etag: graphql_etag_pipeline_path(@pipeline) } } |