diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-24 09:47:22 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-03-24 09:47:22 +0000 |
| commit | b1699ff7a49f4501e98fe85752a76a0a4745d116 (patch) | |
| tree | c2a425ad47773dfee7d5431402353ce8e47fc480 /app/views/projects/pipelines | |
| parent | 9bd611faa7747abbc0ce255e2f10a366081c0179 (diff) | |
| parent | 0759db802f053e2757d52a284fd29098a9473df2 (diff) | |
| download | gitlab-ce-b1699ff7a49f4501e98fe85752a76a0a4745d116.tar.gz | |
Merge branch 'tc-pipeline-show-trigger-date' into 'master'
Correctly show pipeline creator & created_at
Closes #29255
See merge request !9936
Diffstat (limited to 'app/views/projects/pipelines')
| -rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 10 |
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..4be9a1371ec 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) + = user_link(@pipeline.user) .header-action-buttons - if can?(current_user, :update_pipeline, @pipeline.project) - if @pipeline.retryable? |