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

6 files changed, 58 insertions, 44 deletions

diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 75aa44b6cea..e6c3781ab56 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -23,10 +23,17 @@
   .table.ci-table {
     min-width: 1200px;
 
-    .branch-commit {
-      width: 33%;
+    .pipeline-id {
+      color: $black;
     }
 
+    .branch-commit {
+      width: 30%;
+
+      .branch-name {
+        width: 195px
+      }
+    }
   }
 }
 
@@ -92,6 +99,15 @@
     }
   }
 
+  .avatar {
+    margin-left: 0;
+    float: none;
+  }
+
+  .api {
+    color: $code-color;
+  }
+
   .branch-commit {
 
     .branch-name {
@@ -119,7 +135,6 @@
 
     .commit-id {
       color: $gl-link-color;
-      margin-right: 8px;
     }
 
     .commit-title {
@@ -130,10 +145,6 @@
       text-overflow: ellipsis;
     }
 
-    .avatar {
-      margin-left: 0;
-    }
-
     .label {
       margin-right: 4px;
     }
@@ -149,17 +160,11 @@
 
   .icon-container {
     display: inline-block;
-    text-align: right;
-    width: 15px;
-
-    .fa {
-      position: relative;
-      right: 3px;
-    }
+    width: 10px;
 
-    svg {
-      position: relative;
-      right: 1px;
+    &.commit-icon {
+      width: 15px;
+      text-align: center;
     }
   }
 
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index bf157e4f64a..94632056b15 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -27,7 +27,7 @@
         = link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref), class: "monospace branch-name"
       - else
         .light none
-      .icon-container
+      .icon-container.commit-icon
         = custom_icon("icon_commit")
 
     - if commit_sha
diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml
index 36eadbd2bf1..c6f359f5679 100644
--- a/app/views/projects/ci/pipelines/_pipeline.html.haml
+++ b/app/views/projects/ci/pipelines/_pipeline.html.haml
@@ -9,17 +9,15 @@
         = ci_icon_for_status(status)
       - else
         = ci_status_with_icon(status)
-  %td.branch-commit
+
+  %td
     = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do
-      %span ##{pipeline.id}
-    - if pipeline.ref && show_branch
-      .icon-container
-        = pipeline.tag? ? icon('tag') : icon('code-fork')
-      = link_to pipeline.ref, namespace_project_commits_path(pipeline.project.namespace, pipeline.project, pipeline.ref), class: "monospace branch-name"
-    - if show_commit
-      .icon-container
-        = custom_icon("icon_commit")
-      = link_to pipeline.short_sha, namespace_project_commit_path(pipeline.project.namespace, pipeline.project, pipeline.sha), class: "commit-id monospace"
+      %span.pipeline-id ##{pipeline.id}
+    %span by
+    - if pipeline.user
+      = user_avatar(user: pipeline.user, size: 20)
+    - else
+      %span.api.monospace API
     - if pipeline.latest?
       %span.label.label-success.has-tooltip{ title: 'Latest build for this branch' } latest
     - if pipeline.triggered?
@@ -29,6 +27,16 @@
     - if pipeline.builds.any?(&:stuck?)
       %span.label.label-warning stuck
 
+  %td.branch-commit
+    - if pipeline.ref && show_branch
+      .icon-container
+        = pipeline.tag? ? icon('tag') : icon('code-fork')
+      = link_to pipeline.ref, namespace_project_commits_path(pipeline.project.namespace, pipeline.project, pipeline.ref), class: "monospace branch-name"
+    - if show_commit
+      .icon-container.commit-icon
+        = custom_icon("icon_commit")
+      = link_to pipeline.short_sha, namespace_project_commit_path(pipeline.project.namespace, pipeline.project, pipeline.sha), class: "commit-id monospace"
+
     %p.commit-title
       - if commit = pipeline.commit
         = author_avatar(commit, size: 20)
@@ -36,16 +44,15 @@
       - else
         Cant find HEAD commit for this branch
 
-
-    - stages_status = pipeline.statuses.relevant.latest.stages_status
-    %td.stage-cell
-      - stages.each do |stage|
-        - status = stages_status[stage]
-        - tooltip = "#{stage.titleize}: #{status || 'not found'}"
-        - if status
-          .stage-container
-            = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status}", title: tooltip do
-              = ci_icon_for_status(status)
+  - stages_status = pipeline.statuses.relevant.latest.stages_status
+  %td.stage-cell
+    - stages.each do |stage|
+      - status = stages_status[stage]
+      - tooltip = "#{stage.titleize}: #{status || 'not found'}"
+      - if status
+        .stage-container
+          = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status}", title: tooltip do
+            = ci_icon_for_status(status)
 
   %td
     - if pipeline.duration
diff --git a/app/views/projects/commit/_pipelines_list.haml b/app/views/projects/commit/_pipelines_list.haml
index 640651e93f5..ac451441eec 100644
--- a/app/views/projects/commit/_pipelines_list.haml
+++ b/app/views/projects/commit/_pipelines_list.haml
@@ -8,6 +8,7 @@
         %tbody
           %th Status
           %th Pipeline
+          %th Commit
           %th Stages
           %th
           %th
diff --git a/app/views/projects/deployments/_commit.html.haml b/app/views/projects/deployments/_commit.html.haml
index 28813babd7b..ff250eeca50 100644
--- a/app/views/projects/deployments/_commit.html.haml
+++ b/app/views/projects/deployments/_commit.html.haml
@@ -3,7 +3,7 @@
     .icon-container
       = deployment.tag? ? icon('tag') : icon('code-fork')
     = link_to deployment.ref, namespace_project_commits_path(@project.namespace, @project, deployment.ref), class: "monospace branch-name"
-  .icon-container
+  .icon-container.commit-icon
     = custom_icon("icon_commit")
   = link_to deployment.short_sha, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-id monospace"
 
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'