summaryrefslogtreecommitdiff
path: root/app/views/projects/ci
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-10 08:46:28 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-10 09:44:05 -0500
commit094828d01d2c146f2ba56af953333c2186ba9ba6 (patch)
treebf8e15d187cd72a791b727b5a9fd5bb3bda54235 /app/views/projects/ci
parentb24c57d03d5d0e7665e708238450d957422ff711 (diff)
downloadgitlab-ce-094828d01d2c146f2ba56af953333c2186ba9ba6.tar.gz
Trigger updates
Diffstat (limited to 'app/views/projects/ci')
-rw-r--r--app/views/projects/ci/builds/_build.html.haml2
-rw-r--r--app/views/projects/ci/pipelines/_pipeline.html.haml4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index 9248adfde80..c9b0017b28b 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 1bd7ee76f61..263a3ff61f7 100644
--- a/app/views/projects/ci/pipelines/_pipeline.html.haml
+++ b/app/views/projects/ci/pipelines/_pipeline.html.haml
@@ -14,8 +14,8 @@
= link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do
%span.pipeline-id ##{pipeline.id}
%span by
- - if commit = pipeline.commit
- = author_avatar(commit, size: 20)
+ - if pipeline.user
+ = user_avatar(user: pipeline.user, size: 20)
- if pipeline.latest?
%span.label.label-success.has-tooltip{ title: 'Latest build for this branch' } latest
- if pipeline.triggered?