diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-01-19 14:51:25 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-01-19 14:51:25 +0000 |
| commit | 9a985f6ec34d250c4468478a390cb40337d22d33 (patch) | |
| tree | fda1f7f5a6075ee0a202e10136ec8600913ad863 /app/views | |
| parent | c3bea33c991a161e06ee921537a8f953c3d3a297 (diff) | |
| parent | 061bb6eb6ed0ca6be3c571b3fcfd14a6f9729205 (diff) | |
| download | gitlab-ce-9a985f6ec34d250c4468478a390cb40337d22d33.tar.gz | |
Merge branch '23563-document-presenters' into 'master'
Document presenters
Closes #23563
See merge request !8480
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/builds/show.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml index 54724ef5cab..c613e473e4c 100644 --- a/app/views/projects/builds/show.html.haml +++ b/app/views/projects/builds/show.html.haml @@ -51,8 +51,10 @@ .prepend-top-default - if @build.erased? .erased.alert.alert-warning - - erased_by = "by #{link_to @build.erased_by.name, user_path(@build.erased_by)}" if @build.erased_by - Build has been erased #{erased_by.html_safe} #{time_ago_with_tooltip(@build.erased_at)} + - if @build.erased_by_user? + Build has been erased by #{link_to(@build.erased_by_name, user_path(@build.erased_by))} #{time_ago_with_tooltip(@build.erased_at)} + - else + Build has been erased #{time_ago_with_tooltip(@build.erased_at)} - else #js-build-scroll.scroll-controls .scroll-step |