Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToon Claes <toon@gitlab.com>2017-03-13 18:39:12 +0300
committerToon Claes <toon@gitlab.com>2017-03-22 23:26:29 +0300
commite2d5818ee1baa154474124ccc15ad3a29635f1ea (patch)
tree03eab77125d0d89667557b8ceb66f5d113aacb2f /app/views/projects/pipelines/_info.html.haml
parent0068c4498a8a41156450b900232ddfb9766fb610 (diff)
Show pipeline creator & created_at in heading
Instead of showing the commit author & authored_date that triggered the pipeline, show the user and created_at in the heading of the pipeline show.
Diffstat (limited to 'app/views/projects/pipelines/_info.html.haml')
-rw-r--r--app/views/projects/pipelines/_info.html.haml10
1 files changed, 6 insertions, 4 deletions
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml
index 0605af4fcd3..6d60f836866 100644
--- a/app/views/projects/pipelines/_info.html.haml
+++ b/app/views/projects/pipelines/_info.html.haml
@@ -1,10 +1,12 @@
.page-content-header
.header-main-content
= render 'ci/status/badge', status: @pipeline.detailed_status(current_user)
- %strong Pipeline ##{@commit.pipelines.last.id}
- triggered #{time_ago_with_tooltip(@commit.authored_date)} by
- = author_avatar(@commit, size: 24)
- = commit_author_link(@commit)
+ %strong Pipeline ##{@pipeline.id}
+ triggered #{time_ago_with_tooltip(@pipeline.created_at)}
+ - if @pipeline.user
+ by
+ = user_avatar(user: @pipeline.user, size: 24, css_class: 'hidden-xs')
+ = link_to(@pipeline.user.name, user_path(@pipeline.user.username), title: @pipeline.user.email, class: 'has-tooltip commit-committer-link')
.header-action-buttons
- if can?(current_user, :update_pipeline, @pipeline.project)
- if @pipeline.retryable?