Skip to content

G
gitlab-ce
Commit dc42d52a authored by Annabel Dunstone's avatar Annabel Dunstone
Browse files
Options

Add pipelines badge to MR tab

parent f9883dee
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
app/assets/stylesheets/pages/pipelines.scss
View file @ dc42d52a
...@@ -233,11 +233,7 @@ ...@@ -233,11 +233,7 @@
.pipelines.tab-pane { .pipelines.tab-pane {
.content-list.pipelines { .content-list.pipelines {
width: auto; overflow: scroll;
}
.table.builds {
min-width: 900px;
} }
.stage { .stage {
......
app/views/projects/merge_requests/_show.html.haml
View file @ dc42d52a
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
%li.pipelines-tab %li.pipelines-tab
= link_to pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: '#pipelines', action: 'pipelines', toggle: 'tab' } do = link_to pipelines_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: '#pipelines', action: 'pipelines', toggle: 'tab' } do
Pipelines Pipelines
%span.badge %span.badge= @merge_request.all_pipelines.size
%li.builds-tab %li.builds-tab
= link_to builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: '#builds', action: 'builds', toggle: 'tab' } do = link_to builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), data: { target: '#builds', action: 'builds', toggle: 'tab' } do
Builds Builds
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7