diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-06 00:09:42 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-06 00:09:42 +0300 |
commit | 53288eeb6300a5c162f146b13d1710c71f0ee197 (patch) | |
tree | 790faa45cf2a56bb0022ef02f989ddbd8ab0c0d9 /app/views/projects/pipelines | |
parent | 38ceebb9b3a541f8530b379d5b5ab5e13ffc58ed (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/pipelines')
-rw-r--r-- | app/views/projects/pipelines/_with_tabs.html.haml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/views/projects/pipelines/_with_tabs.html.haml b/app/views/projects/pipelines/_with_tabs.html.haml index 37ca020cfb6..e0090915570 100644 --- a/app/views/projects/pipelines/_with_tabs.html.haml +++ b/app/views/projects/pipelines/_with_tabs.html.haml @@ -1,4 +1,5 @@ - test_reports_enabled = Feature.enabled?(:junit_pipeline_view) +- dag_pipeline_tab_enabled = Feature.enabled?(:dag_pipeline_tab) .tabs-holder %ul.pipelines-tabs.nav-links.no-top.no-bottom.mobile-separator.nav.nav-tabs @@ -9,6 +10,10 @@ = link_to builds_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-builds', action: 'builds', toggle: 'tab' }, class: 'builds-tab' do = _('Jobs') %span.badge.badge-pill.js-builds-counter= pipeline.total_size + - if dag_pipeline_tab_enabled + %li.js-dag-tab-link + = link_to dag_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-dag', action: 'dag', toggle: 'tab' }, class: 'dag-tab' do + = _('DAG') - if @pipeline.failed_builds.present? %li.js-failures-tab-link = link_to failures_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-failures', action: 'failures', toggle: 'tab' }, class: 'failures-tab' do @@ -75,6 +80,9 @@ %code.bash.js-build-output = build_summary(build) + - if dag_pipeline_tab_enabled + #js-tab-dag.tab-pane + #js-tab-tests.tab-pane #js-pipeline-tests-detail = render_if_exists "projects/pipelines/tabs_content", pipeline: @pipeline, project: @project |