3 files changed, 8 insertions, 4 deletions
diff --git a/app/views/projects/deployments/_commit.html.haml b/app/views/projects/deployments/_commit.html.haml
index a90c8733862..28813babd7b 100644
--- a/app/views/projects/deployments/_commit.html.haml
+++ b/app/views/projects/deployments/_commit.html.haml
@@ -10,7 +10,7 @@
   %p.commit-title
     %span
       - if commit_title = deployment.commit_title
-        = user_avatar(user: deployment.user, size: 20)
+        = author_avatar(deployment.commit, size: 20)
         = link_to_gfm commit_title, namespace_project_commit_path(@project.namespace, @project, deployment.sha), class: "commit-row-message"
       - else
         Cant find HEAD commit for this branch
diff --git a/app/views/projects/environments/_environment.html.haml b/app/views/projects/environments/_environment.html.haml
index d04967fa72f..718eca15741 100644
--- a/app/views/projects/environments/_environment.html.haml
+++ b/app/views/projects/environments/_environment.html.haml
@@ -6,6 +6,11 @@
 
   %td
     - if last_deployment
+      = user_avatar(user: last_deployment.user, size: 20)
+      %span ##{last_deployment.id}
+
+  %td
+    - if last_deployment
       = render 'projects/deployments/commit', deployment: last_deployment
     - else
       %p.commit-title
@@ -13,9 +18,7 @@
 
   %td
     - if last_deployment
-      %p.finished-at
-        = icon("calendar")
-        #{time_ago_with_tooltip(last_deployment.created_at, short_format: true, skip_js: true)}
+      #{time_ago_with_tooltip(last_deployment.created_at)}
 
   %td
     = render 'projects/deployments/actions', deployment: last_deployment
diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml
index fe8ddb4716e..8bb238bae4e 100644
--- a/app/views/projects/environments/index.html.haml
+++ b/app/views/projects/environments/index.html.haml
@@ -26,6 +26,7 @@
       %table.table.builds.environments
         %tbody
           %th Environment
+          %th Deployment ID
           %th Last deployment
           %th
           %th