diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-10-18 22:38:01 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-10-18 22:38:01 +0300 |
commit | 2c00d00ec1c39dbea0e0e54265027b5476b78e3c (patch) | |
tree | 615b547e97547142732580c73cf36363cb6306be /app/views/projects/pipelines/index.html.haml | |
parent | 60c08db159f7e556820670f35696a90a42198395 (diff) | |
parent | 4e386a2c221432ccba32810725fbfefb1d60ec5c (diff) |
Merge branch '19991-triggered-pipeline' into 'master'
Triggered pipelines
#### What does this MR do?
Separates trigger into its own column
#### Screenshots (if relevant)
![Screen_Shot_2016-10-07_at_4.21.54_PM](/uploads/092e8205d329b66b34045fe17c5e6e4f/Screen_Shot_2016-10-07_at_4.21.54_PM.png)
![Screen_Shot_2016-10-17_at_9.13.10_AM](/uploads/7df90e0e2a07a9f282df3605787d3cc2/Screen_Shot_2016-10-17_at_9.13.10_AM.png)
![Screen_Shot_2016-10-17_at_9.15.07_AM](/uploads/b7dc0307c8549e72c3f812c3cd91833a/Screen_Shot_2016-10-17_at_9.15.07_AM.png)
#### What are the relevant issue numbers?
Closes #19991
See merge request !6753
Diffstat (limited to 'app/views/projects/pipelines/index.html.haml')
-rw-r--r-- | app/views/projects/pipelines/index.html.haml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml index 9eeef5f57b4..4bc49072f35 100644 --- a/app/views/projects/pipelines/index.html.haml +++ b/app/views/projects/pipelines/index.html.haml @@ -45,11 +45,12 @@ .table-holder %table.table.ci-table %thead - %th.col-xs-1.col-sm-1 Status - %th.col-xs-2.col-sm-4 Pipeline - %th.col-xs-2.col-sm-2 Stages - %th.col-xs-2.col-sm-2 - %th.hidden-xs.col-sm-3 + %th Status + %th Pipeline + %th Commit + %th Stages + %th + %th.hidden-xs = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages = paginate @pipelines, theme: 'gitlab' |