From dc42d52a17bef5bdaa91f5d0e4f213664d23af49 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Date: Tue, 16 Aug 2016 15:23:19 -0500 Subject: [PATCH] Add pipelines badge to MR tab --- app/assets/stylesheets/pages/pipelines.scss | 6 +----- app/views/projects/merge_requests/_show.html.haml | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 08651974892..50ac4d8449b 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -233,11 +233,7 @@ .pipelines.tab-pane { .content-list.pipelines { - width: auto; - } - - .table.builds { - min-width: 900px; + overflow: scroll; } .stage { diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index d97c36cf63b..a1313064725 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -56,7 +56,7 @@ %li.pipelines-tab = link_to pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: '#pipelines', action: 'pipelines', toggle: 'tab' } do Pipelines - %span.badge + %span.badge= @merge_request.all_pipelines.size %li.builds-tab = link_to builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: '#builds', action: 'builds', toggle: 'tab' } do Builds -- GitLab