diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-11-09 12:20:32 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-11-10 16:38:00 -0600 |
| commit | 942de35014e6b3b6d92a903e6fdc091e55e4008c (patch) | |
| tree | edacdf7348b678d59b89aacc4ffc35a41a63a45e | |
| parent | 0afbe8fc52d39cab3dd55b7936f072872f1a0326 (diff) | |
| download | gitlab-ce-942de35014e6b3b6d92a903e6fdc091e55e4008c.tar.gz | |
update generic commit status to correspond with build status template
| -rw-r--r-- | app/assets/stylesheets/pages/commits.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/commits.scss b/app/assets/stylesheets/pages/commits.scss index 61fbd7425b7..83ffa0e1d39 100644 --- a/app/assets/stylesheets/pages/commits.scss +++ b/app/assets/stylesheets/pages/commits.scss @@ -84,7 +84,8 @@ font-weight: 600; } -.commit { +.commit, +.generic_commit_status { padding: 10px 0; position: relative; @@ -102,7 +103,6 @@ vertical-align: baseline; } - .avatar { margin-left: -46px; } diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml index 80fe6be49b0..688cda384fb 100644 --- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml +++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml @@ -15,6 +15,15 @@ - if defined?(retried) && retried = icon('warning', class: 'text-warning has-tooltip', title: 'Status was retried.') + %td + = link_to pipeline_path(generic_commit_status.pipeline) do + %span.pipeline-id ##{generic_commit_status.pipeline.id} + %span by + - if generic_commit_status.pipeline.user + = user_avatar(user: generic_commit_status.pipeline.user, size: 20) + - else + %span.api.monospace API + - if defined?(commit_sha) && commit_sha %td = link_to generic_commit_status.short_sha, namespace_project_commit_path(generic_commit_status.project.namespace, generic_commit_status.project, generic_commit_status.sha), class: "monospace" |