diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2016-10-20 11:43:22 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2016-11-16 11:57:53 +0000 |
| commit | b31c9f531853172f5704c81f2f5dee5d1ce37afd (patch) | |
| tree | e63712e8364c52975136d58b195b5b96a9ba7d19 | |
| parent | c28df601dcbfa5b1d44d4f351c64e04a69d24d0e (diff) | |
| download | gitlab-ce-b31c9f531853172f5704c81f2f5dee5d1ce37afd.tar.gz | |
Commit column
| -rw-r--r-- | app/controllers/projects/environments_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/environments/components/_environment.html.haml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index d261bfa9b8d..c760f885a4c 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -76,7 +76,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController last_deployment: { include: { user: { only: [:id, :name, :username], methods: [:avatar_url] }, - deployable: { only: [:id, :name] } + deployable: { only: [:id, :name, :ref, :tag, :short_sha] } } } } diff --git a/app/views/projects/environments/components/_environment.html.haml b/app/views/projects/environments/components/_environment.html.haml index fe34730440f..ef82a70031e 100644 --- a/app/views/projects/environments/components/_environment.html.haml +++ b/app/views/projects/environments/components/_environment.html.haml @@ -21,7 +21,7 @@ %span{ "v-if" => "model.last_deployment.user" } by %a{":href" => "'/' + model.last_deployment.user.username"} - + %img.avatar.has-tooltip.s20{ ":src" => "model.last_deployment.user.avatar_url", ":alt" => "model.last_deployment.user.username + ' avatar'", ":title" => "model.last_deployment.user.username", @@ -35,7 +35,7 @@ %td %a{ "v-if" => "!isFolder && model.last_deployment" } - / = render "projects/deployments/commit", deployment: "{{model.last_deployment}}" + -# = render "projects/deployments/commit", deployment: "{{model.last_deployment}}" %p.commit-title{ "v-if" => "!isFolder && !model.last_deployment"} No deployments yet @@ -80,7 +80,7 @@ %td %a{ "v-if" => "child.last_deployment" } - / = render "projects/deployments/commit", deployment: "{{child.last_deployment}}" + -# = render "projects/deployments/commit", deployment: "{{child.last_deployment}}" %p.commit-title{ "v-if" => "!child.last_deployment"} No deployments yet |