diff options
| author | jakeburden <jburden@gitlab.com> | 2019-08-21 14:58:04 -0400 |
|---|---|---|
| committer | jakeburden <jburden@gitlab.com> | 2019-08-28 08:48:14 -0400 |
| commit | a3edfab1a9fcfdab56d2f2d29fa9f72ce0455ee4 (patch) | |
| tree | d3eb7bbe85a789d72e2cb2296431ac0130f5be41 /app/views/projects/deployments/_deployment.html.haml | |
| parent | ef0f1509dd2a2a3ba5798362e2be21108b705a85 (diff) | |
| download | gitlab-ce-a3edfab1a9fcfdab56d2f2d29fa9f72ce0455ee4.tar.gz | |
Show correct deployment date for a manual job56130-operations-environments-shows-incorrect-deployment-date-for-manual-deploy-jobs
Only display time if the job has deployed
Update JS tests for displaying job deployment time
Simplify boolean check in deployedDate
Diffstat (limited to 'app/views/projects/deployments/_deployment.html.haml')
| -rw-r--r-- | app/views/projects/deployments/_deployment.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml index a11e23b6daa..1dd85c89fd0 100644 --- a/app/views/projects/deployments/_deployment.html.haml +++ b/app/views/projects/deployments/_deployment.html.haml @@ -22,7 +22,8 @@ .table-section.section-15{ role: 'gridcell' } .table-mobile-header{ role: 'rowheader' }= _("Created") - %span.table-mobile-content= time_ago_with_tooltip(deployment.created_at) + - if deployment.deployed_at + %span.table-mobile-content= time_ago_with_tooltip(deployment.deployed_at) .table-section.section-20.table-button-footer{ role: 'gridcell' } .btn-group.table-action-buttons |